diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-10-08 00:48:38 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-08 14:26:57 +0300 |
| commit | e2cb77db089796f163092326ca25512845df7a3a (patch) | |
| tree | d3ebd206afc735e0a6b3cb5ffe959774fd5d1e56 /include/net/ip.h | |
| parent | b92dacd45698e120104ff81066ceb534916090d9 (diff) | |
| download | linux-e2cb77db089796f163092326ca25512845df7a3a.tar.xz | |
ipv4: Merge ip_local_out and ip_local_out_sk
It is confusing and silly hiding a parameter so modify all of
the callers to pass in the appropriate socket or skb->sk if
no socket is known.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/ip.h')
| -rw-r--r-- | include/net/ip.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/net/ip.h b/include/net/ip.h index 46272e04f3b6..03e80f936847 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -113,11 +113,7 @@ 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_sk(struct sock *sk, struct sk_buff *skb); -static inline int ip_local_out(struct sk_buff *skb) -{ - return ip_local_out_sk(skb->sk, 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); void ip_init(void); |