lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 133/575] ifb: fix building without CONFIG_NET_CLS_ACT
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    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>
    ---
    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++;

    \
     
     \ /
      Last update: 2021-11-16 03:19    [W:4.083 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site