diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-10-07 23:48:47 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-08 13:27:03 +0200 |
| commit | ede2059dbaf9c6557a49d466c8c7778343b208ff (patch) | |
| tree | d6d15cbeb675b52ef22890a2228b5301b1396c45 /net/mpls/mpls_iptunnel.c | |
| parent | ipv4, ipv6: Pass net into ip_local_out and ip6_local_out (diff) | |
| download | linux-ede2059dbaf9c6557a49d466c8c7778343b208ff.tar.xz linux-ede2059dbaf9c6557a49d466c8c7778343b208ff.zip | |
dst: Pass net into dst->output
The network namespace is already passed into dst_output pass it into
dst->output lwt->output and friends.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mpls/mpls_iptunnel.c')
| -rw-r--r-- | net/mpls/mpls_iptunnel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mpls/mpls_iptunnel.c b/net/mpls/mpls_iptunnel.c index 21e70bc9af98..67591aef9cae 100644 --- a/net/mpls/mpls_iptunnel.c +++ b/net/mpls/mpls_iptunnel.c @@ -37,7 +37,7 @@ static unsigned int mpls_encap_size(struct mpls_iptunnel_encap *en) return en->labels * sizeof(struct mpls_shim_hdr); } -int mpls_output(struct sock *sk, struct sk_buff *skb) +int mpls_output(struct net *net, struct sock *sk, struct sk_buff *skb) { struct mpls_iptunnel_encap *tun_encap_info; struct mpls_shim_hdr *hdr; |