projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9f0a74d
)
net: kill useless net_*_ingress_queue() definitions when NET_CLS_ACT is unset
author
Pablo Neira
<
[email protected]
>
Tue, 12 May 2015 18:28:07 +0000
(20:28 +0200)
committer
David S. Miller
<
[email protected]
>
Wed, 13 May 2015 19:44:28 +0000
(15:44 -0400)
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 <
[email protected]
>
Signed-off-by: Pablo Neira Ayuso <
[email protected]
>
Acked-by: Daniel Borkmann <
[email protected]
>
Acked-by: Alexei Starovoitov <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
include/linux/rtnetlink.h
patch
|
blob
|
history
diff --git
a/include/linux/rtnetlink.h
b/include/linux/rtnetlink.h
index 7b8e260c4a27df00b8eca70d5cd4f52864ba6d87..bd29ab4b094169f310a0e2057983aa2b874d1e93 100644
(file)
--- 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);