Commit cf91a99d authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller
Browse files

ipv4, ipv6: Pass net into __ip_local_out and __ip6_local_out 



Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 57c4bf85

drivers/net/vrf.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static struct dst_entry *vrf_ip_check(struct dst_entry *dst, u32 cookie) 
	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);

}

include/net/dst_ops.h

+2 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ struct kmem_cachep; 
struct net_device;

struct sk_buff;

struct sock;

struct net;



struct dst_ops {

	unsigned short		family;
@@ -28,7 +29,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 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 sk_buff *skb,

						const void *daddr);

include/net/ip.h

+1 −1
Original line number Diff line number Diff line
@@ -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 (*output)(struct net *, struct sock *, struct sk_buff *));

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_queue_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl);

include/net/ipv6.h

+1 −1
Original line number Diff line number Diff line
@@ -865,7 +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(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);



/*

net/ipv4/ip_output.c

+2 −3
Original line number Diff line number Diff line
@@ -96,9 +96,8 @@ void ip_send_check(struct iphdr *iph) 
}

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);



	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);

	int err;



	err = __ip_local_out(sk, skb);

	err = __ip_local_out(net, sk, skb);

	if (likely(err == 1))

		err = dst_output(net, sk, skb);