diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-10-07 16:48:37 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-08 04:26:57 -0700 |
| commit | b92dacd45698e120104ff81066ceb534916090d9 (patch) | |
| tree | d317a02ae93e19a7ed471079eb5c510d9c566575 /include | |
| parent | 4ebdfba73c09d8568d891bae87c40fad43dd7f41 (diff) | |
| download | linux-b92dacd45698e120104ff81066ceb534916090d9.tar.bz2 | |
ipv4: Merge __ip_local_out and __ip_local_out_sk
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/ip.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/ip.h b/include/net/ip.h index ea1f721f7224..46272e04f3b6 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -112,8 +112,7 @@ int ip_mc_output(struct sock *sk, struct sk_buff *skb); 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_sk(struct sock *sk, struct sk_buff *skb); -int __ip_local_out(struct sk_buff *skb); +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) { |