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 X-Spam-Level: X-Spam-Status: No, score=-2.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=no 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 2955AC54FD4 for ; Wed, 25 Mar 2020 11:02:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0630C20772 for ; Wed, 25 Mar 2020 11:02:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727461AbgCYLCW (ORCPT ); Wed, 25 Mar 2020 07:02:22 -0400 Received: from correo.us.es ([193.147.175.20]:56716 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727456AbgCYLCW (ORCPT ); Wed, 25 Mar 2020 07:02:22 -0400 Received: from antivirus1-rhel7.int (unknown [192.168.2.11]) by mail.us.es (Postfix) with ESMTP id D03C7FB45E for ; Wed, 25 Mar 2020 12:01:43 +0100 (CET) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id C36B9FC5F6 for ; Wed, 25 Mar 2020 12:01:43 +0100 (CET) Received: by antivirus1-rhel7.int (Postfix, from userid 99) id B83D1FC5EE; Wed, 25 Mar 2020 12:01:43 +0100 (CET) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id E10D9FC5E4; Wed, 25 Mar 2020 12:01:41 +0100 (CET) Received: from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int (F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); Wed, 25 Mar 2020 12:01:41 +0100 (CET) X-Virus-Status: clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int) Received: from us.es (unknown [90.77.255.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: 1984lsi) by entrada.int (Postfix) with ESMTPSA id BB38A42EF42A; Wed, 25 Mar 2020 12:01:41 +0100 (CET) Date: Wed, 25 Mar 2020 12:02:18 +0100 X-SMTPAUTHUS: auth mail.us.es From: Pablo Neira Ayuso To: Geert Uytterhoeven Cc: Jozsef Kadlecsik , Florian Westphal , "David S . Miller" , Jakub Kicinski , NetFilter , coreteam@netfilter.org, netdev , Linux-Next Subject: Re: [PATCH] netfilter: nft_fwd_netdev: Fix CONFIG_NET_CLS_ACT=n build Message-ID: <20200325110218.ga2m5n2jfbdbfivs@salvia> References: <20200325093300.5455-1-geert@linux-m68k.org> <20200325104001.yekvtbrw3lvkhvta@salvia> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: NeoMutt/20170113 (1.7.2) X-Virus-Scanned: ClamAV using ClamSMTP Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org On Wed, Mar 25, 2020 at 12:00:08PM +0100, Geert Uytterhoeven wrote: > Hi Pablo, > > On Wed, Mar 25, 2020 at 11:40 AM Pablo Neira Ayuso wrote: > > On Wed, Mar 25, 2020 at 10:33:00AM +0100, Geert Uytterhoeven wrote: > > > If CONFIG_NET_CLS_ACT=n: > > > > > > net/netfilter/nft_fwd_netdev.c: In function ‘nft_fwd_netdev_eval’: > > > net/netfilter/nft_fwd_netdev.c:32:10: error: ‘struct sk_buff’ has no member named ‘tc_redirected’ > > > pkt->skb->tc_redirected = 1; > > > ^~ > > > net/netfilter/nft_fwd_netdev.c:33:10: error: ‘struct sk_buff’ has no member named ‘tc_from_ingress’ > > > pkt->skb->tc_from_ingress = 1; > > > ^~ > > > > > > Fix this by protecting this code hunk with the appropriate #ifdef. > > > > Sorry about this, and thank you for fixing up this so fast. > > > > I'm attaching an alternative fix to avoid a dependency on tc from > > netfilter. Still testing, if fine and no objections I'll formally > > submit this. > > Thanks, that fixes the issue, too. > (Note that I didn't do a full build). Thanks. I'll submit formaly asap. There was another spot I forgot to update in net/core/pktgen.c, I will include that chunk too in my formal submission.