diff options
author | Adrian Bunk <bunk@stusta.de> | 2006-01-07 16:24:25 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-01-07 16:24:25 -0500 |
commit | 9f5336e21893fafd232a9a02cfa7588ad153889a (patch) | |
tree | 83e86a9be67db41144a551cce96d0c2b4884ff70 | |
parent | 97dc627fb3471664c72d0933790a90ba3f91e131 (diff) |
[IPV6]: small cleanups
This patch contains the following cleanups:
- addrconf.c: make addrconf_dad_stop() static
- inet6_connection_sock.c should #include <net/inet6_connection_sock.h>
for getting the prototypes of it's global functions
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/ipv6/addrconf.c | 2 | ||||
-rw-r--r-- | net/ipv6/inet6_connection_sock.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 704fb73e6c5f..e53e421eeee9 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -1228,7 +1228,7 @@ int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2) | |||
1228 | 1228 | ||
1229 | /* Gets referenced address, destroys ifaddr */ | 1229 | /* Gets referenced address, destroys ifaddr */ |
1230 | 1230 | ||
1231 | void addrconf_dad_stop(struct inet6_ifaddr *ifp) | 1231 | static void addrconf_dad_stop(struct inet6_ifaddr *ifp) |
1232 | { | 1232 | { |
1233 | if (ifp->flags&IFA_F_PERMANENT) { | 1233 | if (ifp->flags&IFA_F_PERMANENT) { |
1234 | spin_lock_bh(&ifp->lock); | 1234 | spin_lock_bh(&ifp->lock); |
diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c index 792f90f0f9ec..f8f3a37a1494 100644 --- a/net/ipv6/inet6_connection_sock.c +++ b/net/ipv6/inet6_connection_sock.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <net/inet_hashtables.h> | 25 | #include <net/inet_hashtables.h> |
26 | #include <net/ip6_route.h> | 26 | #include <net/ip6_route.h> |
27 | #include <net/sock.h> | 27 | #include <net/sock.h> |
28 | #include <net/inet6_connection_sock.h> | ||
28 | 29 | ||
29 | int inet6_csk_bind_conflict(const struct sock *sk, | 30 | int inet6_csk_bind_conflict(const struct sock *sk, |
30 | const struct inet_bind_bucket *tb) | 31 | const struct inet_bind_bucket *tb) |