summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Borkmann <daniel@iogearbox.net>2015-05-19 22:33:25 +0200
committerDavid S. Miller <davem@davemloft.net>2015-05-21 16:58:53 -0400
commite7582bab5d28ea72e07cf2c74632eaf46a6c1a50 (patch)
treec3fe8afe334eafede6e44dd2b93f7643cf5d93e1
parenteb9344781a2f8381ed60cd9e662d9ced2d168ecb (diff)
downloadlinux-sh-e7582bab5d28ea72e07cf2c74632eaf46a6c1a50.tar.gz
net: dev: reduce both ingress hook ifdefs
Reduce ifdef pollution slightly, no functional change. We can simply remove the extra alternative definition of handle_ing() and nf_ingress(). Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Acked-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/core/dev.c22
1 files changed, 4 insertions, 18 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 0e7afefb5072..594163d0c6eb 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3627,11 +3627,11 @@ int (*br_fdb_test_addr_hook)(struct net_device *dev,
EXPORT_SYMBOL_GPL(br_fdb_test_addr_hook);
#endif
-#ifdef CONFIG_NET_CLS_ACT
static inline struct sk_buff *handle_ing(struct sk_buff *skb,
struct packet_type **pt_prev,
int *ret, struct net_device *orig_dev)
{
+#ifdef CONFIG_NET_CLS_ACT
struct tcf_proto *cl = rcu_dereference_bh(skb->dev->ingress_cl_list);
struct tcf_result cl_res;
@@ -3665,17 +3665,9 @@ static inline struct sk_buff *handle_ing(struct sk_buff *skb,
default:
break;
}
-
- return skb;
-}
-#else
-static inline struct sk_buff *handle_ing(struct sk_buff *skb,
- struct packet_type **pt_prev,
- int *ret, struct net_device *orig_dev)
-{
+#endif /* CONFIG_NET_CLS_ACT */
return skb;
}
-#endif
/**
* netdev_rx_handler_register - register receive handler
@@ -3748,10 +3740,10 @@ static bool skb_pfmemalloc_protocol(struct sk_buff *skb)
}
}
-#ifdef CONFIG_NETFILTER_INGRESS
static inline int nf_ingress(struct sk_buff *skb, struct packet_type **pt_prev,
int *ret, struct net_device *orig_dev)
{
+#ifdef CONFIG_NETFILTER_INGRESS
if (nf_hook_ingress_active(skb)) {
if (*pt_prev) {
*ret = deliver_skb(skb, *pt_prev, orig_dev);
@@ -3760,15 +3752,9 @@ static inline int nf_ingress(struct sk_buff *skb, struct packet_type **pt_prev,
return nf_hook_ingress(skb);
}
+#endif /* CONFIG_NETFILTER_INGRESS */
return 0;
}
-#else
-static inline int nf_ingress(struct sk_buff *skb, struct packet_type **pt_prev,
- int *ret, struct net_device *orig_dev)
-{
- return 0;
-}
-#endif
static int __netif_receive_skb_core(struct sk_buff *skb, bool pfmemalloc)
{