Skip to content

Commit

Permalink
net: kill useless net_*_ingress_queue() definitions when NET_CLS_ACT …
Browse files Browse the repository at this point in the history
…is unset

This fixes 4577139 ("net: use jump label patching for ingress qdisc in
__netif_receive_skb_core").

The only client of this is sch_ingress and it depends on NET_CLS_ACT. So
there is no way these definition can be of any help.

Cc: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Alexei Starovoitov <ast@plumgrid.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Pablo Neira authored and David S. Miller committed May 13, 2015
1 parent 9f0a74d commit f0b5e8a
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions include/linux/rtnetlink.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,6 @@ struct netdev_queue *dev_ingress_queue_create(struct net_device *dev);
#ifdef CONFIG_NET_CLS_ACT
void net_inc_ingress_queue(void);
void net_dec_ingress_queue(void);
#else
static inline void net_inc_ingress_queue(void)
{
}

static inline void net_dec_ingress_queue(void)
{
}
#endif

extern void rtnetlink_init(void);
Expand Down

0 comments on commit f0b5e8a

Please sign in to comment.