diff options
| author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2012-12-12 12:40:26 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-12-12 12:42:29 -0500 |
| commit | fd0ea7dbfae16015e72c4bbc6b1b43fffc3b914f (patch) | |
| tree | 2473cac23bb26840aa55aa449ec67bc47f3a34e9 | |
| parent | 895464fa4b52f0e5a2ceffc173bad012be02b465 (diff) | |
ndisc: Unexport ndisc_{build,send}_skb().
These symbols were exported for bonding device by commit 305d552a
("bonding: send IPv6 neighbor advertisement on failover").
It bacame obsolete by commit 7c899432 ("bonding, ipv4, ipv6, vlan: Handle
NETDEV_BONDING_FAILOVER like NETDEV_NOTIFY_PEERS") and removed by
commit 4f5762ec ("bonding: Remove obsolete source file 'bond_ipv6.c'").
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/ndisc.h | 15 | ||||
| -rw-r--r-- | net/ipv6/ndisc.c | 27 |
2 files changed, 11 insertions, 31 deletions
diff --git a/include/net/ndisc.h b/include/net/ndisc.h index 980d263765cf..7af1ea893038 100644 --- a/include/net/ndisc.h +++ b/include/net/ndisc.h | |||
| @@ -190,21 +190,6 @@ extern void ndisc_send_redirect(struct sk_buff *skb, | |||
| 190 | extern int ndisc_mc_map(const struct in6_addr *addr, char *buf, | 190 | extern int ndisc_mc_map(const struct in6_addr *addr, char *buf, |
| 191 | struct net_device *dev, int dir); | 191 | struct net_device *dev, int dir); |
| 192 | 192 | ||
| 193 | extern struct sk_buff *ndisc_build_skb(struct net_device *dev, | ||
| 194 | const struct in6_addr *daddr, | ||
| 195 | const struct in6_addr *saddr, | ||
| 196 | struct icmp6hdr *icmp6h, | ||
| 197 | const struct in6_addr *target, | ||
| 198 | int llinfo); | ||
| 199 | |||
| 200 | extern void ndisc_send_skb(struct sk_buff *skb, | ||
| 201 | struct net_device *dev, | ||
| 202 | struct neighbour *neigh, | ||
| 203 | const struct in6_addr *daddr, | ||
| 204 | const struct in6_addr *saddr, | ||
| 205 | struct icmp6hdr *icmp6h); | ||
| 206 | |||
| 207 | |||
| 208 | 193 | ||
| 209 | /* | 194 | /* |
| 210 | * IGMP | 195 | * IGMP |
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index cf43b6550f5b..4c02e6ab96e7 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
| @@ -370,12 +370,12 @@ static void pndisc_destructor(struct pneigh_entry *n) | |||
| 370 | ipv6_dev_mc_dec(dev, &maddr); | 370 | ipv6_dev_mc_dec(dev, &maddr); |
| 371 | } | 371 | } |
| 372 | 372 | ||
| 373 | struct sk_buff *ndisc_build_skb(struct net_device *dev, | 373 | static struct sk_buff *ndisc_build_skb(struct net_device *dev, |
| 374 | const struct in6_addr *daddr, | 374 | const struct in6_addr *daddr, |
| 375 | const struct in6_addr *saddr, | 375 | const struct in6_addr *saddr, |
| 376 | struct icmp6hdr *icmp6h, | 376 | struct icmp6hdr *icmp6h, |
| 377 | const struct in6_addr *target, | 377 | const struct in6_addr *target, |
| 378 | int llinfo) | 378 | int llinfo) |
| 379 | { | 379 | { |
| 380 | struct net *net = dev_net(dev); | 380 | struct net *net = dev_net(dev); |
| 381 | struct sock *sk = net->ipv6.ndisc_sk; | 381 | struct sock *sk = net->ipv6.ndisc_sk; |
| @@ -431,14 +431,11 @@ struct sk_buff *ndisc_build_skb(struct net_device *dev, | |||
| 431 | return skb; | 431 | return skb; |
| 432 | } | 432 | } |
| 433 | 433 | ||
| 434 | EXPORT_SYMBOL(ndisc_build_skb); | 434 | static void ndisc_send_skb(struct sk_buff *skb, struct net_device *dev, |
| 435 | 435 | struct neighbour *neigh, | |
| 436 | void ndisc_send_skb(struct sk_buff *skb, | 436 | const struct in6_addr *daddr, |
| 437 | struct net_device *dev, | 437 | const struct in6_addr *saddr, |
| 438 | struct neighbour *neigh, | 438 | struct icmp6hdr *icmp6h) |
| 439 | const struct in6_addr *daddr, | ||
| 440 | const struct in6_addr *saddr, | ||
| 441 | struct icmp6hdr *icmp6h) | ||
| 442 | { | 439 | { |
| 443 | struct flowi6 fl6; | 440 | struct flowi6 fl6; |
| 444 | struct dst_entry *dst; | 441 | struct dst_entry *dst; |
| @@ -473,8 +470,6 @@ void ndisc_send_skb(struct sk_buff *skb, | |||
| 473 | rcu_read_unlock(); | 470 | rcu_read_unlock(); |
| 474 | } | 471 | } |
| 475 | 472 | ||
| 476 | EXPORT_SYMBOL(ndisc_send_skb); | ||
| 477 | |||
| 478 | /* | 473 | /* |
| 479 | * Send a Neighbour Discover packet | 474 | * Send a Neighbour Discover packet |
| 480 | */ | 475 | */ |
