net: Pass net into dst_output and remove dst_output_okfn (13206b6b) · Commits · e / devices / android_kernel_teracube_2e

include/net/dst.h

+1 −5

Original line number	Original line	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. */		/* Output packet to network from transport. */
	static inline int dst_output(struct sock sk, struct sk_buff skb)		static inline int dst_output(struct net net, struct sock sk, struct sk_buff *skb)
	{		{
	return skb_dst(skb)->output(sk, skb);		return skb_dst(skb)->output(sk, skb);
	}		}
	static inline int dst_output_okfn(struct net net, struct sock sk, struct sk_buff *skb)
	{
	return dst_output(sk, skb);
	}

	/* Input packet from network to transport. */		/* Input packet from network to transport. */
	static inline int dst_input(struct sk_buff *skb)		static inline int dst_input(struct sk_buff *skb)

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -85,7 +85,7 @@ static void dn_nsp_send(struct sk_buff *skb)
	if (dst) {		if (dst) {
	try_again:		try_again:
	skb_dst_set(skb, dst);		skb_dst_set(skb, dst);
	dst_output(skb->sk, skb);		dst_output(&init_net, skb->sk, skb);
	return;		return;
	}		}

	@@ -582,7 +582,7 @@ static __inline__ void dn_nsp_do_disc(struct sock *sk, unsigned char msgflg,
	* associations.		* associations.
	*/		*/
	skb_dst_set(skb, dst_clone(dst));		skb_dst_set(skb, dst_clone(dst));
	dst_output(skb->sk, skb);		dst_output(&init_net, skb->sk, skb);
	}		}

+1 −1

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

	skb_sender_cpu_clear(skb);		skb_sender_cpu_clear(skb);
	return dst_output(sk, skb);		return dst_output(net, sk, skb);
	}		}

	int ip_forward(struct sk_buff *skb)		int ip_forward(struct sk_buff *skb)

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -105,7 +105,7 @@ static int __ip_local_out_sk(struct sock sk, struct sk_buff skb)
	ip_send_check(iph);		ip_send_check(iph);
	return nf_hook(NFPROTO_IPV4, NF_INET_LOCAL_OUT,		return nf_hook(NFPROTO_IPV4, NF_INET_LOCAL_OUT,
	net, sk, skb, NULL, skb_dst(skb)->dev,		net, sk, skb, NULL, skb_dst(skb)->dev,
	dst_output_okfn);		dst_output);
	}		}

	int __ip_local_out(struct sk_buff *skb)		int __ip_local_out(struct sk_buff *skb)
	@@ -115,11 +115,12 @@ int __ip_local_out(struct sk_buff *skb)

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

	err = __ip_local_out_sk(sk, skb);		err = __ip_local_out_sk(sk, skb);
	if (likely(err == 1))		if (likely(err == 1))
	err = dst_output(sk, skb);		err = dst_output(net, sk, skb);

	return err;		return err;
	}		}
	@@ -276,7 +277,7 @@ static int ip_finish_output(struct net net, struct sock sk, struct sk_buff *sk
	/* Policy lookup after SNAT yielded a new policy */		/* Policy lookup after SNAT yielded a new policy */
	if (skb_dst(skb)->xfrm) {		if (skb_dst(skb)->xfrm) {
	IPCB(skb)->flags \|= IPSKB_REROUTED;		IPCB(skb)->flags \|= IPSKB_REROUTED;
	return dst_output(sk, skb);		return dst_output(net, sk, skb);
	}		}
	#endif		#endif
	mtu = ip_skb_dst_mtu(skb);		mtu = ip_skb_dst_mtu(skb);

+1 −1

Original line number	Original line	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_dst_set(skb, dst);
	skb->dev = skb_dst(skb)->dev;		skb->dev = skb_dst(skb)->dev;

	err = dst_output(skb->sk, skb);		err = dst_output(tunnel->net, skb->sk, skb);
	if (net_xmit_eval(err) == 0)		if (net_xmit_eval(err) == 0)
	err = skb->len;		err = skb->len;
	iptunnel_xmit_stats(err, &dev->stats, dev->tstats);		iptunnel_xmit_stats(err, &dev->stats, dev->tstats);