diff options
| author | Adrian Bunk <bunk@stusta.de> | 2004-12-27 02:54:21 -0800 |
|---|---|---|
| committer | Thomas Graf <tgraf@suug.ch> | 2004-12-27 02:54:21 -0800 |
| commit | cc8eaf15d3d413135d8b9c986f13696e9e6dd21e (patch) | |
| tree | 4d07af7a0f3a49bb7dbd213b7a6c60f508802a2b | |
| parent | 7f18c9e6369649e6908ca4ab0546953012aaa6a0 (diff) | |
[IPX]: Make needlessly global code static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/ipx.h | 8 | ||||
| -rw-r--r-- | net/ipx/af_ipx.c | 10 | ||||
| -rw-r--r-- | net/ipx/ipx_proc.c | 6 |
3 files changed, 11 insertions, 13 deletions
diff --git a/include/net/ipx.h b/include/net/ipx.h index 064e5f7a4154..006a31bfa2d1 100644 --- a/include/net/ipx.h +++ b/include/net/ipx.h @@ -139,14 +139,6 @@ static __inline__ void ipxitf_put(struct ipx_interface *intrfc) ipxitf_down(intrfc); } -extern void __ipxitf_down(struct ipx_interface *intrfc); - -static __inline__ void __ipxitf_put(struct ipx_interface *intrfc) -{ - if (atomic_dec_and_test(&intrfc->refcnt)) - __ipxitf_down(intrfc); -} - static __inline__ void ipxrtr_hold(struct ipx_route *rt) { atomic_inc(&rt->refcnt); diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c index e88d37fe262c..6da62172f674 100644 --- a/net/ipx/af_ipx.c +++ b/net/ipx/af_ipx.c @@ -291,7 +291,7 @@ found: } #endif -void __ipxitf_down(struct ipx_interface *intrfc) +static void __ipxitf_down(struct ipx_interface *intrfc) { struct sock *s; struct hlist_node *node, *t; @@ -335,6 +335,12 @@ void ipxitf_down(struct ipx_interface *intrfc) spin_unlock_bh(&ipx_interfaces_lock); } +static __inline__ void __ipxitf_put(struct ipx_interface *intrfc) +{ + if (atomic_dec_and_test(&intrfc->refcnt)) + __ipxitf_down(intrfc); +} + static int ipxitf_device_event(struct notifier_block *notifier, unsigned long event, void *ptr) { @@ -1629,7 +1635,7 @@ out: return rc; } -int ipx_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt) +static int ipx_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt) { /* NULL here for pt means the packet was looped back */ struct ipx_interface *intrfc; diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c index c2febe44d1f2..6b3cb469fc96 100644 --- a/net/ipx/ipx_proc.c +++ b/net/ipx/ipx_proc.c @@ -287,21 +287,21 @@ out: return 0; } -struct seq_operations ipx_seq_interface_ops = { +static struct seq_operations ipx_seq_interface_ops = { .start = ipx_seq_interface_start, .next = ipx_seq_interface_next, .stop = ipx_seq_interface_stop, .show = ipx_seq_interface_show, }; -struct seq_operations ipx_seq_route_ops = { +static struct seq_operations ipx_seq_route_ops = { .start = ipx_seq_route_start, .next = ipx_seq_route_next, .stop = ipx_seq_route_stop, .show = ipx_seq_route_show, }; -struct seq_operations ipx_seq_socket_ops = { +static struct seq_operations ipx_seq_socket_ops = { .start = ipx_seq_socket_start, .next = ipx_seq_socket_next, .stop = ipx_seq_interface_stop, |