diff options
| author |   David S. Miller <davem@davemloft.net> | 2011-02-19 16:42:37 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-19 16:42:37 -0800 |
| commit | ece639caa33c85c8805fa4a0a5955b8de9c95346 (patch) | |
| tree | 5b8d613601c2e01e876a7d241923e90a0e759c3b /include | |
| parent | Merge branch 'rtc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
| parent | netfilter: ip6t_LOG: fix a flaw in printing the MAC (diff) | |
| download | linux-dev-ece639caa33c85c8805fa4a0a5955b8de9c95346.tar.xz linux-dev-ece639caa33c85c8805fa4a0a5955b8de9c95346.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/netfilter/nf_tproxy_core.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/include/net/netfilter/nf_tproxy_core.h b/include/net/netfilter/nf_tproxy_core.h index cd85b3bc8327..e505358d8999 100644 --- a/include/net/netfilter/nf_tproxy_core.h +++ b/include/net/netfilter/nf_tproxy_core.h @@ -201,18 +201,8 @@ nf_tproxy_get_sock_v6(struct net *net, const u8 protocol, } #endif -static inline void -nf_tproxy_put_sock(struct sock *sk) -{ - /* TIME_WAIT inet sockets have to be handled differently */ - if ((sk->sk_protocol == IPPROTO_TCP) && (sk->sk_state == TCP_TIME_WAIT)) - inet_twsk_put(inet_twsk(sk)); - else - sock_put(sk); -} - /* assign a socket to the skb -- consumes sk */ -int +void nf_tproxy_assign_sock(struct sk_buff *skb, struct sock *sk); #endif |