diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-07-09 17:22:10 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-12 15:57:54 -0400 |
| commit | 4bc2f18ba4f22a90ab593c0a580fc9a19c4777b6 (patch) | |
| tree | bb39f427bd468d0e34a73ebc788db726406fa261 /net/ipv4/tcp.c | |
| parent | ba80a2522899ea71a5b201bae60bdfd99126af95 (diff) | |
net/ipv4: EXPORT_SYMBOL cleanups
CodingStyle cleanups
EXPORT_SYMBOL should immediately follow the symbol declaration.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 4e6ddfbab09e..b8601b7683a6 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
| @@ -315,7 +315,6 @@ struct tcp_splice_state { | |||
| 315 | * is strict, actions are advisory and have some latency. | 315 | * is strict, actions are advisory and have some latency. |
| 316 | */ | 316 | */ |
| 317 | int tcp_memory_pressure __read_mostly; | 317 | int tcp_memory_pressure __read_mostly; |
| 318 | |||
| 319 | EXPORT_SYMBOL(tcp_memory_pressure); | 318 | EXPORT_SYMBOL(tcp_memory_pressure); |
| 320 | 319 | ||
| 321 | void tcp_enter_memory_pressure(struct sock *sk) | 320 | void tcp_enter_memory_pressure(struct sock *sk) |
| @@ -325,7 +324,6 @@ void tcp_enter_memory_pressure(struct sock *sk) | |||
| 325 | tcp_memory_pressure = 1; | 324 | tcp_memory_pressure = 1; |
| 326 | } | 325 | } |
| 327 | } | 326 | } |
| 328 | |||
| 329 | EXPORT_SYMBOL(tcp_enter_memory_pressure); | 327 | EXPORT_SYMBOL(tcp_enter_memory_pressure); |
| 330 | 328 | ||
| 331 | /* Convert seconds to retransmits based on initial and max timeout */ | 329 | /* Convert seconds to retransmits based on initial and max timeout */ |
| @@ -460,6 +458,7 @@ unsigned int tcp_poll(struct file *file, struct socket *sock, poll_table *wait) | |||
| 460 | } | 458 | } |
| 461 | return mask; | 459 | return mask; |
| 462 | } | 460 | } |
| 461 | EXPORT_SYMBOL(tcp_poll); | ||
| 463 | 462 | ||
| 464 | int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg) | 463 | int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg) |
| 465 | { | 464 | { |
| @@ -508,6 +507,7 @@ int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg) | |||
| 508 | 507 | ||
| 509 | return put_user(answ, (int __user *)arg); | 508 | return put_user(answ, (int __user *)arg); |
| 510 | } | 509 | } |
| 510 | EXPORT_SYMBOL(tcp_ioctl); | ||
| 511 | 511 | ||
| 512 | static inline void tcp_mark_push(struct tcp_sock *tp, struct sk_buff *skb) | 512 | static inline void tcp_mark_push(struct tcp_sock *tp, struct sk_buff *skb) |
| 513 | { | 513 | { |
| @@ -675,6 +675,7 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *ppos, | |||
| 675 | 675 | ||
| 676 | return ret; | 676 | return ret; |
| 677 | } | 677 | } |
| 678 | EXPORT_SYMBOL(tcp_splice_read); | ||
| 678 | 679 | ||
| 679 | struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp) | 680 | struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp) |
| 680 | { | 681 | { |
| @@ -873,6 +874,7 @@ ssize_t tcp_sendpage(struct socket *sock, struct page *page, int offset, | |||
| 873 | release_sock(sk); | 874 | release_sock(sk); |
| 874 | return res; | 875 | return res; |
| 875 | } | 876 | } |
| 877 | EXPORT_SYMBOL(tcp_sendpage); | ||
| 876 | 878 | ||
| 877 | #define TCP_PAGE(sk) (sk->sk_sndmsg_page) | 879 | #define TCP_PAGE(sk) (sk->sk_sndmsg_page) |
| 878 | #define TCP_OFF(sk) (sk->sk_sndmsg_off) | 880 | #define TCP_OFF(sk) (sk->sk_sndmsg_off) |
| @@ -1121,6 +1123,7 @@ out_err: | |||
| 1121 | release_sock(sk); | 1123 | release_sock(sk); |
| 1122 | return err; | 1124 | return err; |
| 1123 | } | 1125 | } |
| 1126 | EXPORT_SYMBOL(tcp_sendmsg); | ||
| 1124 | 1127 | ||
| 1125 | /* | 1128 | /* |
| 1126 | * Handle reading urgent data. BSD has very simple semantics for | 1129 | * Handle reading urgent data. BSD has very simple semantics for |
| @@ -1380,6 +1383,7 @@ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc, | |||
| 1380 | tcp_cleanup_rbuf(sk, copied); | 1383 | tcp_cleanup_rbuf(sk, copied); |
| 1381 | return copied; | 1384 | return copied; |
| 1382 | } | 1385 | } |
| 1386 | EXPORT_SYMBOL(tcp_read_sock); | ||
| 1383 | 1387 | ||
| 1384 | /* | 1388 | /* |
| 1385 | * This routine copies from a sock struct into the user buffer. | 1389 | * This routine copies from a sock struct into the user buffer. |
| @@ -1774,6 +1778,7 @@ recv_urg: | |||
| 1774 | err = tcp_recv_urg(sk, msg, len, flags); | 1778 | err = tcp_recv_urg(sk, msg, len, flags); |
| 1775 | goto out; | 1779 | goto out; |
| 1776 | } | 1780 | } |
| 1781 | EXPORT_SYMBOL(tcp_recvmsg); | ||
| 1777 | 1782 | ||
| 1778 | void tcp_set_state(struct sock *sk, int state) | 1783 | void tcp_set_state(struct sock *sk, int state) |
| 1779 | { | 1784 | { |
| @@ -1866,6 +1871,7 @@ void tcp_shutdown(struct sock *sk, int how) | |||
| 1866 | tcp_send_fin(sk); | 1871 | tcp_send_fin(sk); |
| 1867 | } | 1872 | } |
| 1868 | } | 1873 | } |
| 1874 | EXPORT_SYMBOL(tcp_shutdown); | ||
| 1869 | 1875 | ||
| 1870 | void tcp_close(struct sock *sk, long timeout) | 1876 | void tcp_close(struct sock *sk, long timeout) |
| 1871 | { | 1877 | { |
| @@ -2029,6 +2035,7 @@ out: | |||
| 2029 | local_bh_enable(); | 2035 | local_bh_enable(); |
| 2030 | sock_put(sk); | 2036 | sock_put(sk); |
| 2031 | } | 2037 | } |
| 2038 | EXPORT_SYMBOL(tcp_close); | ||
| 2032 | 2039 | ||
| 2033 | /* These states need RST on ABORT according to RFC793 */ | 2040 | /* These states need RST on ABORT according to RFC793 */ |
| 2034 | 2041 | ||
| @@ -2102,6 +2109,7 @@ int tcp_disconnect(struct sock *sk, int flags) | |||
| 2102 | sk->sk_error_report(sk); | 2109 | sk->sk_error_report(sk); |
| 2103 | return err; | 2110 | return err; |
| 2104 | } | 2111 | } |
| 2112 | EXPORT_SYMBOL(tcp_disconnect); | ||
| 2105 | 2113 | ||
| 2106 | /* | 2114 | /* |
| 2107 | * Socket option code for TCP. | 2115 | * Socket option code for TCP. |
| @@ -2400,6 +2408,7 @@ int tcp_setsockopt(struct sock *sk, int level, int optname, char __user *optval, | |||
| 2400 | optval, optlen); | 2408 | optval, optlen); |
| 2401 | return do_tcp_setsockopt(sk, level, optname, optval, optlen); | 2409 | return do_tcp_setsockopt(sk, level, optname, optval, optlen); |
| 2402 | } | 2410 | } |
| 2411 | EXPORT_SYMBOL(tcp_setsockopt); | ||
| 2403 | 2412 | ||
| 2404 | #ifdef CONFIG_COMPAT | 2413 | #ifdef CONFIG_COMPAT |
| 2405 | int compat_tcp_setsockopt(struct sock *sk, int level, int optname, | 2414 | int compat_tcp_setsockopt(struct sock *sk, int level, int optname, |
| @@ -2410,7 +2419,6 @@ int compat_tcp_setsockopt(struct sock *sk, int level, int optname, | |||
| 2410 | optval, optlen); | 2419 | optval, optlen); |
| 2411 | return do_tcp_setsockopt(sk, level, optname, optval, optlen); | 2420 | return do_tcp_setsockopt(sk, level, optname, optval, optlen); |
| 2412 | } | 2421 | } |
| 2413 | |||
| 2414 | EXPORT_SYMBOL(compat_tcp_setsockopt); | 2422 | EXPORT_SYMBOL(compat_tcp_setsockopt); |
| 2415 | #endif | 2423 | #endif |
| 2416 | 2424 | ||
| @@ -2476,7 +2484,6 @@ void tcp_get_info(struct sock *sk, struct tcp_info *info) | |||
| 2476 | 2484 | ||
| 2477 | info->tcpi_total_retrans = tp->total_retrans; | 2485 | info->tcpi_total_retrans = tp->total_retrans; |
| 2478 | } | 2486 | } |
| 2479 | |||
| 2480 | EXPORT_SYMBOL_GPL(tcp_get_info); | 2487 | EXPORT_SYMBOL_GPL(tcp_get_info); |
| 2481 | 2488 | ||
| 2482 | static int do_tcp_getsockopt(struct sock *sk, int level, | 2489 | static int do_tcp_getsockopt(struct sock *sk, int level, |
| @@ -2615,6 +2622,7 @@ int tcp_getsockopt(struct sock *sk, int level, int optname, char __user *optval, | |||
| 2615 | optval, optlen); | 2622 | optval, optlen); |
| 2616 | return do_tcp_getsockopt(sk, level, optname, optval, optlen); | 2623 | return do_tcp_getsockopt(sk, level, optname, optval, optlen); |
| 2617 | } | 2624 | } |
| 2625 | EXPORT_SYMBOL(tcp_getsockopt); | ||
| 2618 | 2626 | ||
| 2619 | #ifdef CONFIG_COMPAT | 2627 | #ifdef CONFIG_COMPAT |
| 2620 | int compat_tcp_getsockopt(struct sock *sk, int level, int optname, | 2628 | int compat_tcp_getsockopt(struct sock *sk, int level, int optname, |
| @@ -2625,7 +2633,6 @@ int compat_tcp_getsockopt(struct sock *sk, int level, int optname, | |||
| 2625 | optval, optlen); | 2633 | optval, optlen); |
| 2626 | return do_tcp_getsockopt(sk, level, optname, optval, optlen); | 2634 | return do_tcp_getsockopt(sk, level, optname, optval, optlen); |
| 2627 | } | 2635 | } |
| 2628 | |||
| 2629 | EXPORT_SYMBOL(compat_tcp_getsockopt); | 2636 | EXPORT_SYMBOL(compat_tcp_getsockopt); |
| 2630 | #endif | 2637 | #endif |
| 2631 | 2638 | ||
| @@ -2862,7 +2869,6 @@ void tcp_free_md5sig_pool(void) | |||
| 2862 | if (pool) | 2869 | if (pool) |
| 2863 | __tcp_free_md5sig_pool(pool); | 2870 | __tcp_free_md5sig_pool(pool); |
| 2864 | } | 2871 | } |
| 2865 | |||
| 2866 | EXPORT_SYMBOL(tcp_free_md5sig_pool); | 2872 | EXPORT_SYMBOL(tcp_free_md5sig_pool); |
| 2867 | 2873 | ||
| 2868 | static struct tcp_md5sig_pool * __percpu * | 2874 | static struct tcp_md5sig_pool * __percpu * |
| @@ -2938,7 +2944,6 @@ retry: | |||
| 2938 | } | 2944 | } |
| 2939 | return pool; | 2945 | return pool; |
| 2940 | } | 2946 | } |
| 2941 | |||
| 2942 | EXPORT_SYMBOL(tcp_alloc_md5sig_pool); | 2947 | EXPORT_SYMBOL(tcp_alloc_md5sig_pool); |
| 2943 | 2948 | ||
| 2944 | 2949 | ||
| @@ -2990,7 +2995,6 @@ int tcp_md5_hash_header(struct tcp_md5sig_pool *hp, | |||
| 2990 | th->check = old_checksum; | 2995 | th->check = old_checksum; |
| 2991 | return err; | 2996 | return err; |
| 2992 | } | 2997 | } |
| 2993 | |||
| 2994 | EXPORT_SYMBOL(tcp_md5_hash_header); | 2998 | EXPORT_SYMBOL(tcp_md5_hash_header); |
| 2995 | 2999 | ||
| 2996 | int tcp_md5_hash_skb_data(struct tcp_md5sig_pool *hp, | 3000 | int tcp_md5_hash_skb_data(struct tcp_md5sig_pool *hp, |
| @@ -3024,7 +3028,6 @@ int tcp_md5_hash_skb_data(struct tcp_md5sig_pool *hp, | |||
| 3024 | 3028 | ||
| 3025 | return 0; | 3029 | return 0; |
| 3026 | } | 3030 | } |
| 3027 | |||
| 3028 | EXPORT_SYMBOL(tcp_md5_hash_skb_data); | 3031 | EXPORT_SYMBOL(tcp_md5_hash_skb_data); |
| 3029 | 3032 | ||
| 3030 | int tcp_md5_hash_key(struct tcp_md5sig_pool *hp, struct tcp_md5sig_key *key) | 3033 | int tcp_md5_hash_key(struct tcp_md5sig_pool *hp, struct tcp_md5sig_key *key) |
| @@ -3034,7 +3037,6 @@ int tcp_md5_hash_key(struct tcp_md5sig_pool *hp, struct tcp_md5sig_key *key) | |||
| 3034 | sg_init_one(&sg, key->key, key->keylen); | 3037 | sg_init_one(&sg, key->key, key->keylen); |
| 3035 | return crypto_hash_update(&hp->md5_desc, &sg, key->keylen); | 3038 | return crypto_hash_update(&hp->md5_desc, &sg, key->keylen); |
| 3036 | } | 3039 | } |
| 3037 | |||
| 3038 | EXPORT_SYMBOL(tcp_md5_hash_key); | 3040 | EXPORT_SYMBOL(tcp_md5_hash_key); |
| 3039 | 3041 | ||
| 3040 | #endif | 3042 | #endif |
| @@ -3306,16 +3308,3 @@ void __init tcp_init(void) | |||
| 3306 | tcp_secret_retiring = &tcp_secret_two; | 3308 | tcp_secret_retiring = &tcp_secret_two; |
| 3307 | tcp_secret_secondary = &tcp_secret_two; | 3309 | tcp_secret_secondary = &tcp_secret_two; |
| 3308 | } | 3310 | } |
| 3309 | |||
| 3310 | EXPORT_SYMBOL(tcp_close); | ||
| 3311 | EXPORT_SYMBOL(tcp_disconnect); | ||
| 3312 | EXPORT_SYMBOL(tcp_getsockopt); | ||
| 3313 | EXPORT_SYMBOL(tcp_ioctl); | ||
| 3314 | EXPORT_SYMBOL(tcp_poll); | ||
| 3315 | EXPORT_SYMBOL(tcp_read_sock); | ||
| 3316 | EXPORT_SYMBOL(tcp_recvmsg); | ||
| 3317 | EXPORT_SYMBOL(tcp_sendmsg); | ||
| 3318 | EXPORT_SYMBOL(tcp_splice_read); | ||
| 3319 | EXPORT_SYMBOL(tcp_sendpage); | ||
| 3320 | EXPORT_SYMBOL(tcp_setsockopt); | ||
| 3321 | EXPORT_SYMBOL(tcp_shutdown); | ||
