AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ipv4, ipv6: Pass net into __ip_local_out and __ip6_local_out

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:45 -05:00 committed by David S. Miller
parent 57c4bf859c
commit cf91a99daa
7 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/vrf.c
View File

@ -74,7 +74,7 @@ static struct dst_entry *vrf_ip_check(struct dst_entry *dst, u32 cookie)
return dst; return dst;
} }
static int vrf_ip_local_out(struct sock *sk, struct sk_buff *skb) static int vrf_ip_local_out(struct net *net, struct sock *sk, struct sk_buff *skb)
{ {
return ip_local_out(sk, skb); return ip_local_out(sk, skb);
} }

3
include/net/dst_ops.h
View File

@ -9,6 +9,7 @@ struct kmem_cachep;
struct net_device; struct net_device;
struct sk_buff; struct sk_buff;
struct sock; struct sock;
struct net;
struct dst_ops { struct dst_ops {
unsigned short family; unsigned short family;
@ -28,7 +29,7 @@ struct dst_ops {
struct sk_buff *skb, u32 mtu); struct sk_buff *skb, u32 mtu);
void (*redirect)(struct dst_entry *dst, struct sock *sk, void (*redirect)(struct dst_entry *dst, struct sock *sk,
struct sk_buff *skb); struct sk_buff *skb);
int (*local_out)(struct sock *sk, struct sk_buff *skb); int (*local_out)(struct net *net, struct sock *sk, struct sk_buff *skb);
struct neighbour * (*neigh_lookup)(const struct dst_entry *dst, struct neighbour * (*neigh_lookup)(const struct dst_entry *dst,
struct sk_buff *skb, struct sk_buff *skb,
const void *daddr); const void *daddr);

2
include/net/ip.h
View File

@ -112,7 +112,7 @@ int ip_mc_output(struct sock *sk, struct sk_buff *skb);
int ip_do_fragment(struct net *net, struct sock *sk, struct sk_buff *skb, int ip_do_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,
int (*output)(struct net *, struct sock *, struct sk_buff *)); int (*output)(struct net *, struct sock *, struct sk_buff *));
void ip_send_check(struct iphdr *ip); void ip_send_check(struct iphdr *ip);
int __ip_local_out(struct sock *sk, struct sk_buff *skb); int __ip_local_out(struct net *net, struct sock *sk, struct sk_buff *skb);
int ip_local_out(struct sock *sk, struct sk_buff *skb); int ip_local_out(struct sock *sk, struct sk_buff *skb);
int ip_queue_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl); int ip_queue_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl);

2
include/net/ipv6.h
View File

@ -865,7 +865,7 @@ int ip6_forward(struct sk_buff *skb);
int ip6_input(struct sk_buff *skb); int ip6_input(struct sk_buff *skb);
int ip6_mc_input(struct sk_buff *skb); int ip6_mc_input(struct sk_buff *skb);
int __ip6_local_out(struct sock *sk, struct sk_buff *skb); int __ip6_local_out(struct net *net, struct sock *sk, struct sk_buff *skb);
int ip6_local_out(struct sock *sk, struct sk_buff *skb); int ip6_local_out(struct sock *sk, struct sk_buff *skb);
/* /*

5
net/ipv4/ip_output.c
View File

@ -96,9 +96,8 @@ void ip_send_check(struct iphdr *iph)
} }
EXPORT_SYMBOL(ip_send_check); EXPORT_SYMBOL(ip_send_check);
int __ip_local_out(struct sock *sk, struct sk_buff *skb) int __ip_local_out(struct net *net, struct sock *sk, struct sk_buff *skb)
{ {
struct net *net = dev_net(skb_dst(skb)->dev);
struct iphdr *iph = ip_hdr(skb); struct iphdr *iph = ip_hdr(skb);
iph->tot_len = htons(skb->len); iph->tot_len = htons(skb->len);
@ -113,7 +112,7 @@ int ip_local_out(struct sock *sk, struct sk_buff *skb)
struct net *net = dev_net(skb_dst(skb)->dev); struct net *net = dev_net(skb_dst(skb)->dev);
int err; int err;
err = __ip_local_out(sk, skb); err = __ip_local_out(net, sk, skb);
if (likely(err == 1)) if (likely(err == 1))
err = dst_output(net, sk, skb); err = dst_output(net, sk, skb);

5
net/ipv6/output_core.c
View File

@ -138,9 +138,8 @@ int ip6_dst_hoplimit(struct dst_entry *dst)
EXPORT_SYMBOL(ip6_dst_hoplimit); EXPORT_SYMBOL(ip6_dst_hoplimit);
#endif #endif
int __ip6_local_out(struct sock *sk, struct sk_buff *skb) int __ip6_local_out(struct net *net, struct sock *sk, struct sk_buff *skb)
{ {
struct net *net = dev_net(skb_dst(skb)->dev);
int len; int len;
len = skb->len - sizeof(struct ipv6hdr); len = skb->len - sizeof(struct ipv6hdr);
@ -160,7 +159,7 @@ int ip6_local_out(struct sock *sk, struct sk_buff *skb)
struct net *net = dev_net(skb_dst(skb)->dev); struct net *net = dev_net(skb_dst(skb)->dev);
int err; int err;
err = __ip6_local_out(sk, skb); err = __ip6_local_out(net, sk, skb);
if (likely(err == 1)) if (likely(err == 1))
err = dst_output(net, sk, skb); err = dst_output(net, sk, skb);

2
net/xfrm/xfrm_output.c
View File

@ -136,7 +136,7 @@ int xfrm_output_resume(struct sk_buff *skb, int err)
while (likely((err = xfrm_output_one(skb, err)) == 0)) { while (likely((err = xfrm_output_one(skb, err)) == 0)) {
nf_reset(skb); nf_reset(skb);
err = skb_dst(skb)->ops->local_out(skb->sk, skb); err = skb_dst(skb)->ops->local_out(net, skb->sk, skb);
if (unlikely(err != 1)) if (unlikely(err != 1))
goto out; goto out;