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: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
a6568b2425
commit
5a70649e0d
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user