diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2015-09-16 04:04:18 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-09-18 03:18:37 +0300 |
commit | 0c4b51f0054ce85c0ec578ab818f0631834573eb (patch) | |
tree | 73e729f58fbaf6420e0f390e36aa936ddaa219ef /drivers/net/vrf.c | |
parent | 9dff2c966a0a79a4222553a851f17e679fc28a43 (diff) | |
download | linux-0c4b51f0054ce85c0ec578ab818f0631834573eb.tar.xz |
netfilter: Pass net into okfn
This is immediately motivated by the bridge code that chains functions that
call into netfilter. Without passing net into the okfns the bridge code would
need to guess about the best expression for the network namespace to process
packets in.
As net is frequently one of the first things computed in continuation functions
after netfilter has done it's job passing in the desired network namespace is in
many cases a code simplification.
To support this change the function dst_output_okfn is introduced to
simplify passing dst_output as an okfn. For the moment dst_output_okfn
just silently drops the struct net.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vrf.c')
-rw-r--r-- | drivers/net/vrf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index 979a4db9c6bc..637e9fd1e14c 100644 --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c @@ -253,7 +253,7 @@ static netdev_tx_t vrf_xmit(struct sk_buff *skb, struct net_device *dev) } /* modelled after ip_finish_output2 */ -static int vrf_finish_output(struct sock *sk, struct sk_buff *skb) +static int vrf_finish_output(struct net *net, struct sock *sk, struct sk_buff *skb) { struct dst_entry *dst = skb_dst(skb); struct rtable *rt = (struct rtable *)dst; |