xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipv4: Merge ip_local_out and ip_local_out_sk

Browse Source 
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>
This commit is contained in:
Eric W. Biederman
2015-10-07 16:48:38 -05:00
committed by David S. Miller
parent b92dacd456
commit e2cb77db08
11 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/vrf.c
View File

@@ -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