diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2015-10-08 00:48:38 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-10-08 14:26:57 +0300 |
commit | e2cb77db089796f163092326ca25512845df7a3a (patch) | |
tree | d3ebd206afc735e0a6b3cb5ffe959774fd5d1e56 /drivers/net/ipvlan | |
parent | b92dacd45698e120104ff81066ceb534916090d9 (diff) | |
download | linux-e2cb77db089796f163092326ca25512845df7a3a.tar.xz |
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 'drivers/net/ipvlan')
-rw-r--r-- | drivers/net/ipvlan/ipvlan_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ipvlan/ipvlan_core.c b/drivers/net/ipvlan/ipvlan_core.c index 207f62e8de9a..c75ad39c752f 100644 --- a/drivers/net/ipvlan/ipvlan_core.c +++ b/drivers/net/ipvlan/ipvlan_core.c @@ -364,7 +364,7 @@ static int ipvlan_process_v4_outbound(struct sk_buff *skb) } skb_dst_drop(skb); skb_dst_set(skb, &rt->dst); - err = ip_local_out(skb); + err = ip_local_out(skb->sk, skb); if (unlikely(net_xmit_eval(err))) dev->stats.tx_errors++; else |