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/vrf.c | |
| 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/vrf.c')
| -rw-r--r-- | drivers/net/vrf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index 1039eb5f6c2a..231f9d85d4eb 100644 --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c @@ -76,7 +76,7 @@ static struct dst_entry *vrf_ip_check(struct dst_entry *dst, u32 cookie) static int vrf_ip_local_out(struct sock *sk, struct sk_buff *skb) { - return ip_local_out_sk(sk, skb); + return ip_local_out(sk, skb); } static unsigned int vrf_v4_mtu(const struct dst_entry *dst) @@ -222,7 +222,7 @@ static netdev_tx_t vrf_process_v4_outbound(struct sk_buff *skb, RT_SCOPE_LINK); } - ret = ip_local_out(skb); + ret = ip_local_out(skb->sk, skb); if (unlikely(net_xmit_eval(ret))) vrf_dev->stats.tx_errors++; else |