From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6EF9C433FE for ; Tue, 16 Nov 2021 02:16:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BF8D261B48 for ; Tue, 16 Nov 2021 02:16:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347671AbhKPCSk (ORCPT ); Mon, 15 Nov 2021 21:18:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:34776 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238831AbhKORrl (ORCPT ); Mon, 15 Nov 2021 12:47:41 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 215F2632A2; Mon, 15 Nov 2021 17:29:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1636997397; bh=mopvfgDoJ9t5syKO0l0QLONLtr5UPWSCeUTEAmFJlxo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ICoFslTuAV7idNF5nDycIcKkSzVXp+PNLj2kMP3vPZlLuBLU96fUA5eFTpy85IzA2 dnoLBbssdrexfe5IGa7EQwUPm6A3C7s6HzPgUd+SZbbZB4JqbEQH9OIOaIxN6QzH6M aQ941yCFGax0eSQfNr0zUs8GJWu57vfLUuN7wZwA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , "David S. Miller" Subject: [PATCH 5.10 133/575] ifb: fix building without CONFIG_NET_CLS_ACT Date: Mon, 15 Nov 2021 17:57:38 +0100 Message-Id: <20211115165348.307387055@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211115165343.579890274@linuxfoundation.org> References: <20211115165343.579890274@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann commit 7444d706be31753f65052c7f6325fc8470cc1789 upstream. The driver no longer depends on this option, but it fails to build if it's disabled because the skb->tc_skip_classify is hidden behind an #ifdef: drivers/net/ifb.c:81:8: error: no member named 'tc_skip_classify' in 'struct sk_buff' skb->tc_skip_classify = 1; Use the same #ifdef around the assignment. Fixes: 046178e726c2 ("ifb: Depend on netfilter alternatively to tc") Signed-off-by: Arnd Bergmann Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ifb.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/net/ifb.c +++ b/drivers/net/ifb.c @@ -76,7 +76,9 @@ static void ifb_ri_tasklet(unsigned long while ((skb = __skb_dequeue(&txp->tq)) != NULL) { skb->redirected = 0; +#ifdef CONFIG_NET_CLS_ACT skb->tc_skip_classify = 1; +#endif u64_stats_update_begin(&txp->tsync); txp->tx_packets++;