diff options
-rw-r--r-- | include/net/addrconf.h | 1 | ||||
-rw-r--r-- | net/ipv6/anycast.c | 29 |
2 files changed, 0 insertions, 30 deletions
diff --git a/include/net/addrconf.h b/include/net/addrconf.h index f68dce2d8d88..757a17638b1b 100644 --- a/include/net/addrconf.h +++ b/include/net/addrconf.h | |||
@@ -160,7 +160,6 @@ extern void addrconf_prefix_rcv(struct net_device *dev, | |||
160 | extern int ipv6_sock_ac_join(struct sock *sk,int ifindex, const struct in6_addr *addr); | 160 | extern int ipv6_sock_ac_join(struct sock *sk,int ifindex, const struct in6_addr *addr); |
161 | extern int ipv6_sock_ac_drop(struct sock *sk,int ifindex, const struct in6_addr *addr); | 161 | extern int ipv6_sock_ac_drop(struct sock *sk,int ifindex, const struct in6_addr *addr); |
162 | extern void ipv6_sock_ac_close(struct sock *sk); | 162 | extern void ipv6_sock_ac_close(struct sock *sk); |
163 | extern int inet6_ac_check(struct sock *sk, const struct in6_addr *addr, int ifindex); | ||
164 | 163 | ||
165 | extern int ipv6_dev_ac_inc(struct net_device *dev, const struct in6_addr *addr); | 164 | extern int ipv6_dev_ac_inc(struct net_device *dev, const struct in6_addr *addr); |
166 | extern int __ipv6_dev_ac_dec(struct inet6_dev *idev, const struct in6_addr *addr); | 165 | extern int __ipv6_dev_ac_dec(struct inet6_dev *idev, const struct in6_addr *addr); |
diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c index 59402b4637f9..db00d27ffb16 100644 --- a/net/ipv6/anycast.c +++ b/net/ipv6/anycast.c | |||
@@ -211,35 +211,6 @@ void ipv6_sock_ac_close(struct sock *sk) | |||
211 | rcu_read_unlock(); | 211 | rcu_read_unlock(); |
212 | } | 212 | } |
213 | 213 | ||
214 | #if 0 | ||
215 | /* The function is not used, which is funny. Apparently, author | ||
216 | * supposed to use it to filter out datagrams inside udp/raw but forgot. | ||
217 | * | ||
218 | * It is OK, anycasts are not special comparing to delivery to unicasts. | ||
219 | */ | ||
220 | |||
221 | int inet6_ac_check(struct sock *sk, struct in6_addr *addr, int ifindex) | ||
222 | { | ||
223 | struct ipv6_ac_socklist *pac; | ||
224 | struct ipv6_pinfo *np = inet6_sk(sk); | ||
225 | int found; | ||
226 | |||
227 | found = 0; | ||
228 | read_lock(&ipv6_sk_ac_lock); | ||
229 | for (pac=np->ipv6_ac_list; pac; pac=pac->acl_next) { | ||
230 | if (ifindex && pac->acl_ifindex != ifindex) | ||
231 | continue; | ||
232 | found = ipv6_addr_equal(&pac->acl_addr, addr); | ||
233 | if (found) | ||
234 | break; | ||
235 | } | ||
236 | read_unlock(&ipv6_sk_ac_lock); | ||
237 | |||
238 | return found; | ||
239 | } | ||
240 | |||
241 | #endif | ||
242 | |||
243 | static void aca_put(struct ifacaddr6 *ac) | 214 | static void aca_put(struct ifacaddr6 *ac) |
244 | { | 215 | { |
245 | if (atomic_dec_and_test(&ac->aca_refcnt)) { | 216 | if (atomic_dec_and_test(&ac->aca_refcnt)) { |