From patchwork Tue Sep 29 11:01:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 263250 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9429BC4727C for ; Tue, 29 Sep 2020 11:45:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 56FA8207F7 for ; Tue, 29 Sep 2020 11:45:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601379939; bh=xbmZiav8KBb2lLzmDpq2li++HkxxT7yOisH4XlscVxE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Lukl0fcWu66h9rTz8fqMYNZkHvg4bc9txXOlrPp5mPRypYOxlQBaP+xpdpxqpK09M gAcwj9t/fZejx72xnr1BAPHr9p1YN4O5DJ8mofdk7GDVaxC7BHfy8RUVbLVoipRW42 utkWw/Eqc+qAaXfwDlV9aqdmBbyHwl37ap2sKA/c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730738AbgI2Lpg (ORCPT ); Tue, 29 Sep 2020 07:45:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:45632 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730475AbgI2Lpd (ORCPT ); Tue, 29 Sep 2020 07:45:33 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A96E22075F; Tue, 29 Sep 2020 11:45:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601379933; bh=xbmZiav8KBb2lLzmDpq2li++HkxxT7yOisH4XlscVxE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CwGf67SXSBE1+uUR5+s7gm/eQNF2o3KpbyTFYNxogvXlv8LNr+fTAvHvYh2jAQFVT 565Mfb+R6Ox8H6eeA3Q+Z8XnuDdUc/QiKGSAaQ54SvoToh1xmISpqQAEWRp1ez0eyG dhSu7pHrk+D6ltmtIvSlqFat02bDSMXx+qIV46dQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sven Eckelmann , Simon Wunderlich , Sasha Levin Subject: [PATCH 5.4 352/388] batman-adv: Add missing include for in_interrupt() Date: Tue, 29 Sep 2020 13:01:23 +0200 Message-Id: <20200929110027.503979078@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929110010.467764689@linuxfoundation.org> References: <20200929110010.467764689@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sven Eckelmann [ Upstream commit 4bba9dab86b6ac15ca560ef1f2b5aa4529cbf784 ] The fix for receiving (internally generated) bla packets outside the interrupt context introduced the usage of in_interrupt(). But this functionality is only defined in linux/preempt.h which was not included with the same patch. Fixes: 279e89b2281a ("batman-adv: bla: use netif_rx_ni when not in interrupt context") Signed-off-by: Sven Eckelmann Signed-off-by: Simon Wunderlich Signed-off-by: Sasha Levin --- net/batman-adv/bridge_loop_avoidance.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 62d2e766dd392..fe406c17b2c0a 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include