[IPV4 TCP]: Dont export or inline __tcp_put_port, but do inline tcp_put_port.

diff --git a/include/net/tcp.h b/include/net/tcp.h
index 052621f03bc859e31c47886640448124b5b6737a..fbbfd588daf17c00ba0034fc26c06595ece59318 100644 (file)
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -638,7 +638,6 @@ DECLARE_SNMP_STAT(struct tcp_mib, tcp_statistics);
 #define TCP_DEC_STATS(field)           SNMP_DEC_STATS(tcp_statistics, field)
 
 extern void                    tcp_put_port(struct sock *sk);
-extern void                    __tcp_put_port(struct sock *sk);
 extern void                    tcp_inherit_port(struct sock *sk, struct sock *child);
 
 extern void                    tcp_v4_err(struct sk_buff *skb, u32);

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 0a89ca89ae020acec0a10d7af20377eed7bf5d60..c2382aaa51e28e1fec757eee9fe1b14ef7a36b5b 100644 (file)
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -286,7 +286,7 @@ fail:
 /* Get rid of any references to a local port held by the
  * given sock.
  */
-__inline__ void __tcp_put_port(struct sock *sk)
+static void __tcp_put_port(struct sock *sk)
 {
        struct inet_opt *inet = inet_sk(sk);
        struct tcp_bind_hashbucket *head = &tcp_bhash[tcp_bhashfn(inet->num)];
@@ -308,7 +308,7 @@ __inline__ void __tcp_put_port(struct sock *sk)
        spin_unlock(&head->lock);
 }
 
-void tcp_put_port(struct sock *sk)
+__inline__ void tcp_put_port(struct sock *sk)
 {
        local_bh_disable();
        __tcp_put_port(sk);