Commit 17d20784 authored by Lukas Wunner's avatar Lukas Wunner Committed by Pablo Neira Ayuso

netfilter: Generalize ingress hook include file

Prepare for addition of a netfilter egress hook by generalizing the
ingress hook include file.

No functional change intended.
Signed-off-by: default avatarLukas Wunner <lukas@wunner.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 7463acfb
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
#ifndef _NETFILTER_INGRESS_H_ #ifndef _NETFILTER_NETDEV_H_
#define _NETFILTER_INGRESS_H_ #define _NETFILTER_NETDEV_H_
#include <linux/netfilter.h> #include <linux/netfilter.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
...@@ -38,10 +38,6 @@ static inline int nf_hook_ingress(struct sk_buff *skb) ...@@ -38,10 +38,6 @@ static inline int nf_hook_ingress(struct sk_buff *skb)
return ret; return ret;
} }
static inline void nf_hook_ingress_init(struct net_device *dev)
{
RCU_INIT_POINTER(dev->nf_hooks_ingress, NULL);
}
#else /* CONFIG_NETFILTER_INGRESS */ #else /* CONFIG_NETFILTER_INGRESS */
static inline int nf_hook_ingress_active(struct sk_buff *skb) static inline int nf_hook_ingress_active(struct sk_buff *skb)
{ {
...@@ -52,7 +48,13 @@ static inline int nf_hook_ingress(struct sk_buff *skb) ...@@ -52,7 +48,13 @@ static inline int nf_hook_ingress(struct sk_buff *skb)
{ {
return 0; return 0;
} }
static inline void nf_hook_ingress_init(struct net_device *dev) {}
#endif /* CONFIG_NETFILTER_INGRESS */ #endif /* CONFIG_NETFILTER_INGRESS */
#endif /* _NETFILTER_INGRESS_H_ */
static inline void nf_hook_netdev_init(struct net_device *dev)
{
#ifdef CONFIG_NETFILTER_INGRESS
RCU_INIT_POINTER(dev->nf_hooks_ingress, NULL);
#endif
}
#endif /* _NETFILTER_NETDEV_H_ */
...@@ -10867,7 +10867,7 @@ struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name, ...@@ -10867,7 +10867,7 @@ struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name,
if (!dev->ethtool_ops) if (!dev->ethtool_ops)
dev->ethtool_ops = &default_ethtool_ops; dev->ethtool_ops = &default_ethtool_ops;
nf_hook_ingress_init(dev); nf_hook_netdev_init(dev);
return dev; return dev;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment