diff options
| author |   Eric W. Biederman <ebiederm@xmission.com> | 2015-10-07 16:48:35 -0500 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-10-08 04:26:54 -0700 |
| commit | 13206b6bff3b15b724926a222406476bf2c23c40 (patch) | |
| tree | 4d433aa937254f44d86411cd33355072b56925ab /include/net/dst.h | |
| parent | xfrm: Only compute net once in xfrm_policy_queue_process (diff) | |
| download | linux-dev-13206b6bff3b15b724926a222406476bf2c23c40.tar.xz linux-dev-13206b6bff3b15b724926a222406476bf2c23c40.zip | |
net: Pass net into dst_output and remove dst_output_okfn
Replace dst_output_okfn with dst_output
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/dst.h')
| -rw-r--r-- | include/net/dst.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/net/dst.h b/include/net/dst.h index 779206c15f8b..fdd01fed1a7b 100644 --- a/include/net/dst.h +++ b/include/net/dst.h @@ -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(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); } -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. */ static inline int dst_input(struct sk_buff *skb) |