diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-16 22:26:58 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-16 22:26:58 -0700 |
| commit | 6811d58fc148c393f80a9f5a9db49d7e75cdc546 (patch) | |
| tree | c25d5b0e49ec848943d35f819e748d157ccb492e /include/net/tcp.h | |
| parent | c4949f074332a64baeb2ead6ab9319ca37642f96 (diff) | |
| parent | c02db8c6290bb992442fec1407643c94cc414375 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
include/linux/if_link.h
Diffstat (limited to 'include/net/tcp.h')
| -rw-r--r-- | include/net/tcp.h | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index fb5c66b2ab81..a1449144848a 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -1206,30 +1206,15 @@ extern int tcp_v4_md5_do_del(struct sock *sk, extern struct tcp_md5sig_pool * __percpu *tcp_alloc_md5sig_pool(struct sock *); extern void tcp_free_md5sig_pool(void); -extern struct tcp_md5sig_pool *__tcp_get_md5sig_pool(int cpu); -extern void __tcp_put_md5sig_pool(void); +extern struct tcp_md5sig_pool *tcp_get_md5sig_pool(void); +extern void tcp_put_md5sig_pool(void); + extern int tcp_md5_hash_header(struct tcp_md5sig_pool *, struct tcphdr *); extern int tcp_md5_hash_skb_data(struct tcp_md5sig_pool *, struct sk_buff *, unsigned header_len); extern int tcp_md5_hash_key(struct tcp_md5sig_pool *hp, struct tcp_md5sig_key *key); -static inline -struct tcp_md5sig_pool *tcp_get_md5sig_pool(void) -{ - int cpu = get_cpu(); - struct tcp_md5sig_pool *ret = __tcp_get_md5sig_pool(cpu); - if (!ret) - put_cpu(); - return ret; -} - -static inline void tcp_put_md5sig_pool(void) -{ - __tcp_put_md5sig_pool(); - put_cpu(); -} - /* write queue abstraction */ static inline void tcp_write_queue_purge(struct sock *sk) { |