[PATCH nf-next,v2 2/3] net: expose dev_fwd_path() helper via static inline
Pablo Neira Ayuso <[email protected]>
| Newsgroups | gmane.comp.security.firewalls.netfilter.devel |
|---|---|
| Message-ID | <[email protected]> |
This is a preparation patch to be used by the bridge family to retrieve the bridge vlan filtering information from the bridge port when discovering the bridge flowtable path. Signed-off-by: Pablo Neira Ayuso <[email protected]> --- v2: no changes include/linux/netdevice.h | 11 +++++++++++ net/core/dev.c | 10 ---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index db04b6d2e8d2..3793a8c0b0be 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -3420,6 +3420,17 @@ void dev_remove_offload(struct packet_offload *po); int dev_get_iflink(const struct net_device *dev); int dev_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb); + +static inline struct net_device_path *dev_fwd_path(struct net_device_path_stack *stack) +{ + int k = stack->num_paths++; + + if (k >= NET_DEVICE_PATH_STACK_MAX) + return NULL; + + return &stack->path[k]; +} + int dev_fill_forward_path(struct net_device_path_ctx *ctx, struct net_device_path_stack *stack); struct net_device *dev_get_by_name(struct net *net, const char *name); diff --git a/net/core/dev.c b/net/core/dev.c index 24c384ef9e78..48288a5dc870 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -740,16 +740,6 @@ int dev_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb) } EXPORT_SYMBOL_GPL(dev_fill_metadata_dst); -static struct net_device_path *dev_fwd_path(struct net_device_path_stack *stack) -{ - int k = stack->num_paths++; - - if (k >= NET_DEVICE_PATH_STACK_MAX) - return NULL; - - return &stack->path[k]; -} - int dev_fill_forward_path(struct net_device_path_ctx *ctx, struct net_device_path_stack *stack) { -- 2.47.3