diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-10-07 16:48:38 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-08 04:26:57 -0700 |
| commit | e2cb77db089796f163092326ca25512845df7a3a (patch) | |
| tree | d3ebd206afc735e0a6b3cb5ffe959774fd5d1e56 /net/ipv4/ip_tunnel_core.c | |
| parent | b92dacd45698e120104ff81066ceb534916090d9 (diff) | |
| download | blackbird-op-linux-e2cb77db089796f163092326ca25512845df7a3a.tar.gz blackbird-op-linux-e2cb77db089796f163092326ca25512845df7a3a.zip | |
ipv4: Merge ip_local_out and ip_local_out_sk
It is confusing and silly hiding a parameter so modify all of
the callers to pass in the appropriate socket or skb->sk if
no socket is known.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_tunnel_core.c')
| -rw-r--r-- | net/ipv4/ip_tunnel_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c index 84dce6a92f93..8d85ecd1ced5 100644 --- a/net/ipv4/ip_tunnel_core.c +++ b/net/ipv4/ip_tunnel_core.c @@ -79,7 +79,7 @@ int iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb, __ip_select_ident(dev_net(rt->dst.dev), iph, skb_shinfo(skb)->gso_segs ?: 1); - err = ip_local_out_sk(sk, skb); + err = ip_local_out(sk, skb); if (unlikely(net_xmit_eval(err))) pkt_len = 0; return pkt_len; |
