From patchwork Tue Sep 29 11:01:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 262946 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=unavailable 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 5A4DAC4727F for ; Tue, 29 Sep 2020 12:34:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ED2F42083B for ; Tue, 29 Sep 2020 12:34:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601382875; bh=cgyfGqByLAhJPcPTifkjUcp1HIWTyZzzQYNES0LO0ow=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=WQhySnTJy3rXZS1GzuKJNfaR3jGFU7Cv8o9QOxwHmzm5qYXPT42HkrVLqKNUyBcJk P2xhBdoeKn9SFDEoDEZDm/yYjvyWBncRqCqvMgR3j7hqlXxqWFDSNNPsGpw6JbjwjO 06/jR90gvi8uyyPlAmonOnGsLBU6lUo4ZZhx8QfA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729602AbgI2MeR (ORCPT ); Tue, 29 Sep 2020 08:34:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:37026 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729572AbgI2LW5 (ORCPT ); Tue, 29 Sep 2020 07:22:57 -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 96C2020848; Tue, 29 Sep 2020 11:20:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601378411; bh=cgyfGqByLAhJPcPTifkjUcp1HIWTyZzzQYNES0LO0ow=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0pu5P1idE3nFzsbjDfSt1M9dAW+EoXojSNk4kwsDrAHh6hGZhZTNRJSkKEV8uvYHT gm7DofVgohPYpSzqdLJbDnWRtJ83FtCWFFj09HdeALx4wrt0oWIkLad+kyy1UctvGQ mE9Pyg9RtxDOxifQqENkNKbUvY86FJSjLuC4DX7s= 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 4.14 156/166] batman-adv: Add missing include for in_interrupt() Date: Tue, 29 Sep 2020 13:01:08 +0200 Message-Id: <20200929105942.978435637@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929105935.184737111@linuxfoundation.org> References: <20200929105935.184737111@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 0f1a77d6aa932..5b6c2e87e3356 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include