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>

diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index 980d263765cf41059ede684d54abafb6a9e66c6c..7af1ea893038fd211af63298c13a92f8a0107877 100644 (file)
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -190,21 +190,6 @@ extern void                        ndisc_send_redirect(struct sk_buff *skb,
 extern int                     ndisc_mc_map(const struct in6_addr *addr, char *buf,
                                             struct net_device *dev, int dir);
 
-extern struct sk_buff          *ndisc_build_skb(struct net_device *dev,
-                                                const struct in6_addr *daddr,
-                                                const struct in6_addr *saddr,
-                                                struct icmp6hdr *icmp6h,
-                                                const struct in6_addr *target,
-                                                int llinfo);
-
-extern void                    ndisc_send_skb(struct sk_buff *skb,
-                                              struct net_device *dev,
-                                              struct neighbour *neigh,
-                                              const struct in6_addr *daddr,
-                                              const struct in6_addr *saddr,
-                                              struct icmp6hdr *icmp6h);
-
-
 
 /*
  *     IGMP

diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index cf43b6550f5b062ddfaa67964b4502460566c642..4c02e6ab96e7d2990adcda4afa1dc8bac63e1b5c 100644 (file)
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -370,12 +370,12 @@ static void pndisc_destructor(struct pneigh_entry *n)
        ipv6_dev_mc_dec(dev, &maddr);
 }
 
-struct sk_buff *ndisc_build_skb(struct net_device *dev,
-                               const struct in6_addr *daddr,
-                               const struct in6_addr *saddr,
-                               struct icmp6hdr *icmp6h,
-                               const struct in6_addr *target,
-                               int llinfo)
+static struct sk_buff *ndisc_build_skb(struct net_device *dev,
+                                      const struct in6_addr *daddr,
+                                      const struct in6_addr *saddr,
+                                      struct icmp6hdr *icmp6h,
+                                      const struct in6_addr *target,
+                                      int llinfo)
 {
        struct net *net = dev_net(dev);
        struct sock *sk = net->ipv6.ndisc_sk;
@@ -431,14 +431,11 @@ struct sk_buff *ndisc_build_skb(struct net_device *dev,
        return skb;
 }
 
-EXPORT_SYMBOL(ndisc_build_skb);
-
-void ndisc_send_skb(struct sk_buff *skb,
-                   struct net_device *dev,
-                   struct neighbour *neigh,
-                   const struct in6_addr *daddr,
-                   const struct in6_addr *saddr,
-                   struct icmp6hdr *icmp6h)
+static void ndisc_send_skb(struct sk_buff *skb, struct net_device *dev,
+                          struct neighbour *neigh,
+                          const struct in6_addr *daddr,
+                          const struct in6_addr *saddr,
+                          struct icmp6hdr *icmp6h)
 {
        struct flowi6 fl6;
        struct dst_entry *dst;
@@ -473,8 +470,6 @@ void ndisc_send_skb(struct sk_buff *skb,
        rcu_read_unlock();
 }
 
-EXPORT_SYMBOL(ndisc_send_skb);
-
 /*
  *     Send a Neighbour Discover packet
  */