Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

net: Merge dst_output and dst_output_sk 



Add a sock paramter to dst_output making dst_output_sk superfluous.
Add a skb->sk parameter to all of the callers of dst_output
Have the callers of dst_output_sk call dst_output.

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

include/net/dst.h

+1 −5
Original line number Diff line number Diff line
@@ -454,14 +454,10 @@ static inline void dst_set_expires(struct dst_entry *dst, int timeout) 
}



/* Output packet to network from transport.  */

static inline int dst_output_sk(struct sock *sk, struct sk_buff *skb)

static inline int dst_output(struct sock *sk, struct sk_buff *skb)

{

	return skb_dst(skb)->output(sk, skb);

}

static inline int dst_output(struct sk_buff *skb)

{

	return dst_output_sk(skb->sk, skb);

}



/* Input packet from network to transport.  */

static inline int dst_input(struct sk_buff *skb)

net/decnet/dn_nsp_out.c

+2 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static void dn_nsp_send(struct sk_buff *skb) 
	if (dst) {

try_again:

		skb_dst_set(skb, dst);

		dst_output(skb);

		dst_output(skb->sk, skb);

		return;

	}
@@ -582,7 +582,7 @@ static __inline__ void dn_nsp_do_disc(struct sock *sk, unsigned char msgflg, 
	 * associations.

	 */

	skb_dst_set(skb, dst_clone(dst));

	dst_output(skb);

	dst_output(skb->sk, skb);

}

net/ipv4/ip_forward.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static int ip_forward_finish(struct sock *sk, struct sk_buff *skb) 
		ip_forward_options(skb);



	skb_sender_cpu_clear(skb);

	return dst_output_sk(sk, skb);

	return dst_output(sk, skb);

}



int ip_forward(struct sk_buff *skb)

net/ipv4/ip_output.c

+3 −3
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static int __ip_local_out_sk(struct sock *sk, struct sk_buff *skb) 
	iph->tot_len = htons(skb->len);

	ip_send_check(iph);

	return nf_hook(NFPROTO_IPV4, NF_INET_LOCAL_OUT, sk, skb, NULL,

		       skb_dst(skb)->dev, dst_output_sk);

		       skb_dst(skb)->dev, dst_output);

}



int __ip_local_out(struct sk_buff *skb)
@@ -116,7 +116,7 @@ int ip_local_out_sk(struct sock *sk, struct sk_buff *skb) 


	err = __ip_local_out(skb);

	if (likely(err == 1))

		err = dst_output_sk(sk, skb);

		err = dst_output(sk, skb);



	return err;

}
@@ -271,7 +271,7 @@ static int ip_finish_output(struct sock *sk, struct sk_buff *skb) 
	/* Policy lookup after SNAT yielded a new policy */

	if (skb_dst(skb)->xfrm) {

		IPCB(skb)->flags |= IPSKB_REROUTED;

		return dst_output_sk(sk, skb);

		return dst_output(sk, skb);

	}

#endif

	mtu = ip_skb_dst_mtu(skb);

net/ipv4/ip_vti.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static netdev_tx_t vti_xmit(struct sk_buff *skb, struct net_device *dev, 
	skb_dst_set(skb, dst);

	skb->dev = skb_dst(skb)->dev;



	err = dst_output(skb);

	err = dst_output(skb->sk, skb);

	if (net_xmit_eval(err) == 0)

		err = skb->len;

	iptunnel_xmit_stats(err, &dev->stats, dev->tstats);