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 
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:37 -05:00
committed by David S. Miller
parent 4ebdfba73c
commit b92dacd456
4 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
net/ipv4/ip_output.c
View File

@@ -96,7 +96,7 @@ void ip_send_check(struct iphdr *iph)
}
EXPORT_SYMBOL(ip_send_check);
int __ip_local_out_sk(struct sock *sk, struct sk_buff *skb)
int __ip_local_out(struct sock *sk, struct sk_buff *skb)
{
struct net *net = dev_net(skb_dst(skb)->dev);
struct iphdr *iph = ip_hdr(skb);
@@ -108,17 +108,12 @@ int __ip_local_out_sk(struct sock *sk, struct sk_buff *skb)
dst_output);
}
int __ip_local_out(struct sk_buff *skb)
{
return __ip_local_out_sk(skb->sk, skb);
}
int ip_local_out_sk(struct sock *sk, struct sk_buff *skb)
{
struct net *net = dev_net(skb_dst(skb)->dev);
int err;
err = __ip_local_out_sk(sk, skb);
err = __ip_local_out(sk, skb);
if (likely(err == 1))
err = dst_output(net, sk, skb);