]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
ifb: fix building without CONFIG_NET_CLS_ACT
authorArnd Bergmann <arnd@arndb.de>
Fri, 29 Oct 2021 11:30:51 +0000 (13:30 +0200)
committerAndrea Righi <andrea.righi@canonical.com>
Tue, 7 Dec 2021 06:32:36 +0000 (07:32 +0100)
BugLink: https://bugs.launchpad.net/bugs/1951822
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 <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
drivers/net/ifb.c

index e9258a9f3702ca8b02f68745cbf6c9d5bda43062..31bc02421dd4ed91160367f01ccf27f773070a11 100644 (file)
@@ -76,7 +76,9 @@ static void ifb_ri_tasklet(struct tasklet_struct *t)
 
        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++;