UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
YOSHIFUJI Hideaki 2012-12-13 02:40:26 +09:00 committed by David S. Miller
parent 895464fa4b
commit fd0ea7dbfa
2 changed files with 11 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/net/ndisc.h
View File

@ -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, extern int ndisc_mc_map(const struct in6_addr *addr, char *buf,
struct net_device *dev, int dir); 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 * IGMP

27
net/ipv6/ndisc.c
View File

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