| Message ID | 1431455287-4925-1-git-send-email-pablo@netfilter.org |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 05/12/2015 08:28 PM, Pablo Neira Ayuso wrote: > This fixes 4577139b2dabf589 ("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> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, May 12, 2015 at 08:28:07PM +0200, Pablo Neira Ayuso wrote: > This fixes 4577139b2dabf589 ("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> > --- thank you for following up on this one. Acked-by: Alexei Starovoitov <ast@plumgrid.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Pablo Neira Ayuso <pablo@netfilter.org> Date: Tue, 12 May 2015 20:28:07 +0200 > This fixes 4577139b2dabf589 ("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> Applied, thanks Pablo. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index 7b8e260..bd29ab4 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h @@ -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);
This fixes 4577139b2dabf589 ("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> --- include/linux/rtnetlink.h | 8 -------- 1 file changed, 8 deletions(-)