OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dst: Pass a sk into .local_out 

For consistency with the other similar methods in the kernel pass a
struct sock into the dst_ops .local_out method.

Simplifying the socket passing case is needed a prequel to passing a
struct net reference into .local_out.

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:36 -05:00 committed by David S. Miller
parent 13206b6bff
commit 4ebdfba73c
11 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/vrf.c
View File

@ -74,9 +74,9 @@ static struct dst_entry *vrf_ip_check(struct dst_entry *dst, u32 cookie)
return dst;
}
static int vrf_ip_local_out(struct sk_buff *skb)
static int vrf_ip_local_out(struct sock *sk, struct sk_buff *skb)
{
return ip_local_out(skb);
return ip_local_out_sk(sk, skb);
}
static unsigned int vrf_v4_mtu(const struct dst_entry *dst)

2
include/net/dst_ops.h
View File

@ -28,7 +28,7 @@ struct dst_ops {
struct sk_buff *skb, u32 mtu);
void (*redirect)(struct dst_entry *dst, struct sock *sk,
struct sk_buff *skb);
int (*local_out)(struct sk_buff *skb);
int (*local_out)(struct sock *sk, struct sk_buff *skb);
struct neighbour * (*neigh_lookup)(const struct dst_entry *dst,
struct sk_buff *skb,
const void *daddr);

1
include/net/ip.h
View File

@ -112,6 +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 (*output)(struct net *, struct sock *, struct sk_buff *));
void ip_send_check(struct iphdr *ip);
int __ip_local_out_sk(struct sock *sk, struct sk_buff *skb);
int __ip_local_out(struct sk_buff *skb);
int ip_local_out_sk(struct sock *sk, struct sk_buff *skb);
static inline int ip_local_out(struct sk_buff *skb)

1
include/net/ipv6.h
View File

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

2
net/ipv4/ip_output.c
View File

@ -96,7 +96,7 @@ void ip_send_check(struct iphdr *iph)
}
EXPORT_SYMBOL(ip_send_check);
static int __ip_local_out_sk(struct sock *sk, struct sk_buff *skb)
int __ip_local_out_sk(struct sock *sk, struct sk_buff *skb)
{
struct net *net = dev_net(skb_dst(skb)->dev);
struct iphdr *iph = ip_hdr(skb);

2
net/ipv4/route.c
View File

@ -165,7 +165,7 @@ static struct dst_ops ipv4_dst_ops = {
.link_failure = ipv4_link_failure,
.update_pmtu = ip_rt_update_pmtu,
.redirect = ip_do_redirect,
.local_out = __ip_local_out,
.local_out = __ip_local_out_sk,
.neigh_lookup = ipv4_neigh_lookup,
};

2
net/ipv4/xfrm4_policy.c
View File

@ -243,7 +243,7 @@ static struct dst_ops xfrm4_dst_ops = {
.cow_metrics = dst_cow_metrics_generic,
.destroy = xfrm4_dst_destroy,
.ifdown = xfrm4_dst_ifdown,
.local_out = __ip_local_out,
.local_out = __ip_local_out_sk,
.gc_thresh = 32768,
};

2
net/ipv6/output_core.c
View File

@ -138,7 +138,7 @@ int ip6_dst_hoplimit(struct dst_entry *dst)
EXPORT_SYMBOL(ip6_dst_hoplimit);
#endif
static int __ip6_local_out_sk(struct sock *sk, struct sk_buff *skb)
int __ip6_local_out_sk(struct sock *sk, struct sk_buff *skb)
{
struct net *net = dev_net(skb_dst(skb)->dev);
int len;

2
net/ipv6/route.c
View File

@ -226,7 +226,7 @@ static struct dst_ops ip6_dst_ops_template = {
.link_failure = ip6_link_failure,
.update_pmtu = ip6_rt_update_pmtu,
.redirect = rt6_do_redirect,
.local_out = __ip6_local_out,
.local_out = __ip6_local_out_sk,
.neigh_lookup = ip6_neigh_lookup,
};

2
net/ipv6/xfrm6_policy.c
View File

@ -285,7 +285,7 @@ static struct dst_ops xfrm6_dst_ops = {
.cow_metrics = dst_cow_metrics_generic,
.destroy = xfrm6_dst_destroy,
.ifdown = xfrm6_dst_ifdown,
.local_out = __ip6_local_out,
.local_out = __ip6_local_out_sk,
.gc_thresh = 32768,
};

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)) {
nf_reset(skb);
err = skb_dst(skb)->ops->local_out(skb);
err = skb_dst(skb)->ops->local_out(skb->sk, skb);
if (unlikely(err != 1))
goto out;