Commit 6b994273 authored by David S. Miller's avatar David S. Miller

[TCP]: extern __inline__ --> static inline where appropriate.

parent 80dbe6fd
......@@ -614,19 +614,19 @@ struct tcp_func {
* and worry about wraparound (automatic with unsigned arithmetic).
*/
extern __inline int before(__u32 seq1, __u32 seq2)
static inline int before(__u32 seq1, __u32 seq2)
{
return (__s32)(seq1-seq2) < 0;
}
extern __inline int after(__u32 seq1, __u32 seq2)
static inline int after(__u32 seq1, __u32 seq2)
{
return (__s32)(seq2-seq1) < 0;
}
/* is s2<=s1<=s3 ? */
extern __inline int between(__u32 seq1, __u32 seq2, __u32 seq3)
static inline int between(__u32 seq1, __u32 seq2, __u32 seq3)
{
return seq3 - seq2 >= seq1 - seq2;
}
......@@ -642,7 +642,7 @@ DECLARE_SNMP_STAT(struct tcp_mib, tcp_statistics);
#define TCP_ADD_STATS_BH(field, val) SNMP_ADD_STATS_BH(tcp_statistics, field, val)
#define TCP_ADD_STATS_USER(field, val) SNMP_ADD_STATS_USER(tcp_statistics, field, val)
extern __inline__ void tcp_put_port(struct sock *sk);
extern inline 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);
......
......@@ -2101,7 +2101,7 @@ void tcp_close(struct sock *sk, long timeout)
/* These states need RST on ABORT according to RFC793 */
extern __inline__ int tcp_need_reset(int state)
static inline int tcp_need_reset(int state)
{
return (1 << state) &
(TCPF_ESTABLISHED | TCPF_CLOSE_WAIT | TCPF_FIN_WAIT1 |
......
......@@ -603,7 +603,7 @@ tcpdiag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
}
extern __inline__ void tcpdiag_rcv_skb(struct sk_buff *skb)
static inline void tcpdiag_rcv_skb(struct sk_buff *skb)
{
int err;
struct nlmsghdr * nlh;
......
......@@ -171,7 +171,7 @@ static __inline__ void __tcp_inherit_port(struct sock *sk, struct sock *child)
spin_unlock(&head->lock);
}
__inline__ void tcp_inherit_port(struct sock *sk, struct sock *child)
inline void tcp_inherit_port(struct sock *sk, struct sock *child)
{
local_bh_disable();
__tcp_inherit_port(sk, child);
......@@ -316,7 +316,7 @@ static void __tcp_put_port(struct sock *sk)
spin_unlock(&head->lock);
}
__inline__ void tcp_put_port(struct sock *sk)
inline void tcp_put_port(struct sock *sk)
{
local_bh_disable();
__tcp_put_port(sk);
......@@ -458,7 +458,7 @@ static struct sock *__tcp_v4_lookup_listener(struct sock *sk, u32 daddr,
}
/* Optimize the common listener case. */
__inline__ struct sock *tcp_v4_lookup_listener(u32 daddr, unsigned short hnum,
inline struct sock *tcp_v4_lookup_listener(u32 daddr, unsigned short hnum,
int dif)
{
struct sock *sk;
......@@ -529,7 +529,7 @@ static inline struct sock *__tcp_v4_lookup(u32 saddr, u16 sport,
return sk ? : tcp_v4_lookup_listener(daddr, hnum, dif);
}
__inline__ struct sock *tcp_v4_lookup(u32 saddr, u16 sport, u32 daddr,
inline struct sock *tcp_v4_lookup(u32 saddr, u16 sport, u32 daddr,
u16 dport, int dif)
{
struct sock *sk;
......
......@@ -370,7 +370,7 @@ static inline struct sock *__tcp_v6_lookup(struct in6_addr *saddr, u16 sport,
return tcp_v6_lookup_listener(daddr, hnum, dif);
}
__inline__ struct sock *tcp_v6_lookup(struct in6_addr *saddr, u16 sport,
inline struct sock *tcp_v6_lookup(struct in6_addr *saddr, u16 sport,
struct in6_addr *daddr, u16 dport,
int dif)
{
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment