diff options
author | Adrian Bunk <bunk@stusta.de> | 2006-04-12 16:57:59 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-04-14 18:00:20 -0400 |
commit | 6c97e72a162648eaf7c401cfc139493cefa6bed2 (patch) | |
tree | c39ad40f44e0439cb7c30db3d394cb9c8496010c | |
parent | f043ca43c1ae354346f72dc5826d820d5619f0b2 (diff) |
[IPV4]: Possible cleanups.
This patch contains the following possible cleanups:
- make the following needlessly global function static:
- arp.c: arp_rcv()
- remove the following unused EXPORT_SYMBOL's:
- devinet.c: devinet_ioctl
- fib_frontend.c: ip_rt_ioctl
- inet_hashtables.c: inet_bind_bucket_create
- inet_hashtables.c: inet_bind_hash
- tcp_input.c: sysctl_tcp_abc
- tcp_ipv4.c: sysctl_tcp_tw_reuse
- tcp_output.c: sysctl_tcp_mtu_probing
- tcp_output.c: sysctl_tcp_base_mss
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/net/arp.h | 2 | ||||
-rw-r--r-- | net/ipv4/arp.c | 4 | ||||
-rw-r--r-- | net/ipv4/devinet.c | 1 | ||||
-rw-r--r-- | net/ipv4/fib_frontend.c | 1 | ||||
-rw-r--r-- | net/ipv4/inet_hashtables.c | 4 | ||||
-rw-r--r-- | net/ipv4/tcp_input.c | 1 | ||||
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 1 | ||||
-rw-r--r-- | net/ipv4/tcp_output.c | 3 |
8 files changed, 2 insertions, 15 deletions
diff --git a/include/net/arp.h b/include/net/arp.h index a13e30c35f42..643bded9f557 100644 --- a/include/net/arp.h +++ b/include/net/arp.h | |||
@@ -10,8 +10,6 @@ | |||
10 | extern struct neigh_table arp_tbl; | 10 | extern struct neigh_table arp_tbl; |
11 | 11 | ||
12 | extern void arp_init(void); | 12 | extern void arp_init(void); |
13 | extern int arp_rcv(struct sk_buff *skb, struct net_device *dev, | ||
14 | struct packet_type *pt, struct net_device *orig_dev); | ||
15 | extern int arp_find(unsigned char *haddr, struct sk_buff *skb); | 13 | extern int arp_find(unsigned char *haddr, struct sk_buff *skb); |
16 | extern int arp_ioctl(unsigned int cmd, void __user *arg); | 14 | extern int arp_ioctl(unsigned int cmd, void __user *arg); |
17 | extern void arp_send(int type, int ptype, u32 dest_ip, | 15 | extern void arp_send(int type, int ptype, u32 dest_ip, |
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c index 041dadde31af..4749d504c629 100644 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c | |||
@@ -928,7 +928,8 @@ static void parp_redo(struct sk_buff *skb) | |||
928 | * Receive an arp request from the device layer. | 928 | * Receive an arp request from the device layer. |
929 | */ | 929 | */ |
930 | 930 | ||
931 | int arp_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev) | 931 | static int arp_rcv(struct sk_buff *skb, struct net_device *dev, |
932 | struct packet_type *pt, struct net_device *orig_dev) | ||
932 | { | 933 | { |
933 | struct arphdr *arp; | 934 | struct arphdr *arp; |
934 | 935 | ||
@@ -1417,7 +1418,6 @@ static int __init arp_proc_init(void) | |||
1417 | 1418 | ||
1418 | EXPORT_SYMBOL(arp_broken_ops); | 1419 | EXPORT_SYMBOL(arp_broken_ops); |
1419 | EXPORT_SYMBOL(arp_find); | 1420 | EXPORT_SYMBOL(arp_find); |
1420 | EXPORT_SYMBOL(arp_rcv); | ||
1421 | EXPORT_SYMBOL(arp_create); | 1421 | EXPORT_SYMBOL(arp_create); |
1422 | EXPORT_SYMBOL(arp_xmit); | 1422 | EXPORT_SYMBOL(arp_xmit); |
1423 | EXPORT_SYMBOL(arp_send); | 1423 | EXPORT_SYMBOL(arp_send); |
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index 81c2f7885292..54419b27686f 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c | |||
@@ -1556,7 +1556,6 @@ void __init devinet_init(void) | |||
1556 | #endif | 1556 | #endif |
1557 | } | 1557 | } |
1558 | 1558 | ||
1559 | EXPORT_SYMBOL(devinet_ioctl); | ||
1560 | EXPORT_SYMBOL(in_dev_finish_destroy); | 1559 | EXPORT_SYMBOL(in_dev_finish_destroy); |
1561 | EXPORT_SYMBOL(inet_select_addr); | 1560 | EXPORT_SYMBOL(inet_select_addr); |
1562 | EXPORT_SYMBOL(inetdev_by_index); | 1561 | EXPORT_SYMBOL(inetdev_by_index); |
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index 4e3d3811dea2..cdde96390960 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c | |||
@@ -666,4 +666,3 @@ void __init ip_fib_init(void) | |||
666 | } | 666 | } |
667 | 667 | ||
668 | EXPORT_SYMBOL(inet_addr_type); | 668 | EXPORT_SYMBOL(inet_addr_type); |
669 | EXPORT_SYMBOL(ip_rt_ioctl); | ||
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c index ef7366fc132f..ee9b5515b9ae 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c | |||
@@ -43,8 +43,6 @@ struct inet_bind_bucket *inet_bind_bucket_create(kmem_cache_t *cachep, | |||
43 | return tb; | 43 | return tb; |
44 | } | 44 | } |
45 | 45 | ||
46 | EXPORT_SYMBOL(inet_bind_bucket_create); | ||
47 | |||
48 | /* | 46 | /* |
49 | * Caller must hold hashbucket lock for this tb with local BH disabled | 47 | * Caller must hold hashbucket lock for this tb with local BH disabled |
50 | */ | 48 | */ |
@@ -64,8 +62,6 @@ void inet_bind_hash(struct sock *sk, struct inet_bind_bucket *tb, | |||
64 | inet_csk(sk)->icsk_bind_hash = tb; | 62 | inet_csk(sk)->icsk_bind_hash = tb; |
65 | } | 63 | } |
66 | 64 | ||
67 | EXPORT_SYMBOL(inet_bind_hash); | ||
68 | |||
69 | /* | 65 | /* |
70 | * Get rid of any references to a local port held by the given sock. | 66 | * Get rid of any references to a local port held by the given sock. |
71 | */ | 67 | */ |
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 195d83584558..9f0cca4c4fae 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -4559,7 +4559,6 @@ discard: | |||
4559 | 4559 | ||
4560 | EXPORT_SYMBOL(sysctl_tcp_ecn); | 4560 | EXPORT_SYMBOL(sysctl_tcp_ecn); |
4561 | EXPORT_SYMBOL(sysctl_tcp_reordering); | 4561 | EXPORT_SYMBOL(sysctl_tcp_reordering); |
4562 | EXPORT_SYMBOL(sysctl_tcp_abc); | ||
4563 | EXPORT_SYMBOL(tcp_parse_options); | 4562 | EXPORT_SYMBOL(tcp_parse_options); |
4564 | EXPORT_SYMBOL(tcp_rcv_established); | 4563 | EXPORT_SYMBOL(tcp_rcv_established); |
4565 | EXPORT_SYMBOL(tcp_rcv_state_process); | 4564 | EXPORT_SYMBOL(tcp_rcv_state_process); |
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 9e85c0416109..672950e54c49 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -1859,5 +1859,4 @@ EXPORT_SYMBOL(tcp_proc_unregister); | |||
1859 | #endif | 1859 | #endif |
1860 | EXPORT_SYMBOL(sysctl_local_port_range); | 1860 | EXPORT_SYMBOL(sysctl_local_port_range); |
1861 | EXPORT_SYMBOL(sysctl_tcp_low_latency); | 1861 | EXPORT_SYMBOL(sysctl_tcp_low_latency); |
1862 | EXPORT_SYMBOL(sysctl_tcp_tw_reuse); | ||
1863 | 1862 | ||
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 9d79546d384e..b871db6adc55 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
@@ -59,9 +59,6 @@ int sysctl_tcp_tso_win_divisor = 3; | |||
59 | int sysctl_tcp_mtu_probing = 0; | 59 | int sysctl_tcp_mtu_probing = 0; |
60 | int sysctl_tcp_base_mss = 512; | 60 | int sysctl_tcp_base_mss = 512; |
61 | 61 | ||
62 | EXPORT_SYMBOL(sysctl_tcp_mtu_probing); | ||
63 | EXPORT_SYMBOL(sysctl_tcp_base_mss); | ||
64 | |||
65 | static void update_send_head(struct sock *sk, struct tcp_sock *tp, | 62 | static void update_send_head(struct sock *sk, struct tcp_sock *tp, |
66 | struct sk_buff *skb) | 63 | struct sk_buff *skb) |
67 | { | 64 | { |