luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ipv6: remove unused neigh parameter from ndisc functions

Browse Source 
Since commit 12fd84f438 ("ipv6: Remove unused neigh argument for
icmp6_dst_alloc() and its callers."), the neigh parameter of ndisc_send_na
and ndisc_send_ns is unused.

CC: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Benc 2015-09-22 18:57:13 +02:00 committed by David S. Miller
parent 92c14d9b5e
commit 38cf595b19
6 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/usb/cdc_mbim.c
View File

@ -342,7 +342,7 @@ static void do_neigh_solicit(struct usbnet *dev, u8 *buf, u16 tci)
in6_dev_put(in6_dev); in6_dev_put(in6_dev);
/* ipv6_stub != NULL if in6_dev_get returned an inet6_dev */ /* ipv6_stub != NULL if in6_dev_get returned an inet6_dev */
ipv6_stub->ndisc_send_na(netdev, NULL, &iph->saddr, &msg->target, ipv6_stub->ndisc_send_na(netdev, &iph->saddr, &msg->target,
is_router /* router */, is_router /* router */,
true /* solicited */, true /* solicited */,
false /* override */, false /* override */,

3
include/net/addrconf.h
View File

@ -192,8 +192,7 @@ struct ipv6_stub {
int (*ipv6_dst_lookup)(struct net *net, struct sock *sk, int (*ipv6_dst_lookup)(struct net *net, struct sock *sk,
struct dst_entry **dst, struct flowi6 *fl6); struct dst_entry **dst, struct flowi6 *fl6);
void (*udpv6_encap_enable)(void); void (*udpv6_encap_enable)(void);
void (*ndisc_send_na)(struct net_device *dev, struct neighbour *neigh, void (*ndisc_send_na)(struct net_device *dev, const struct in6_addr *daddr,
const struct in6_addr *daddr,
const struct in6_addr *solicited_addr, const struct in6_addr *solicited_addr,
bool router, bool solicited, bool override, bool inc_opt); bool router, bool solicited, bool override, bool inc_opt);
struct neigh_table *nd_tbl; struct neigh_table *nd_tbl;

6
include/net/ndisc.h
View File

@ -180,15 +180,13 @@ void ndisc_cleanup(void);
int ndisc_rcv(struct sk_buff *skb); int ndisc_rcv(struct sk_buff *skb);
void ndisc_send_ns(struct net_device *dev, struct neighbour *neigh, void ndisc_send_ns(struct net_device *dev, const struct in6_addr *solicit,
const struct in6_addr *solicit,
const struct in6_addr *daddr, const struct in6_addr *saddr, const struct in6_addr *daddr, const struct in6_addr *saddr,
struct sk_buff *oskb); struct sk_buff *oskb);
void ndisc_send_rs(struct net_device *dev, void ndisc_send_rs(struct net_device *dev,
const struct in6_addr *saddr, const struct in6_addr *daddr); const struct in6_addr *saddr, const struct in6_addr *daddr);
void ndisc_send_na(struct net_device *dev, struct neighbour *neigh, void ndisc_send_na(struct net_device *dev, const struct in6_addr *daddr,
const struct in6_addr *daddr,
const struct in6_addr *solicited_addr, const struct in6_addr *solicited_addr,
bool router, bool solicited, bool override, bool inc_opt); bool router, bool solicited, bool override, bool inc_opt);

2
net/ipv6/addrconf.c
View File

@ -3625,7 +3625,7 @@ static void addrconf_dad_work(struct work_struct *w)
/* send a neighbour solicitation for our addr */ /* send a neighbour solicitation for our addr */
addrconf_addr_solict_mult(&ifp->addr, &mcaddr); addrconf_addr_solict_mult(&ifp->addr, &mcaddr);
ndisc_send_ns(ifp->idev->dev, NULL, &ifp->addr, &mcaddr, &in6addr_any, NULL); ndisc_send_ns(ifp->idev->dev, &ifp->addr, &mcaddr, &in6addr_any, NULL);
out: out:
in6_ifa_put(ifp); in6_ifa_put(ifp);
rtnl_unlock(); rtnl_unlock();

17
net/ipv6/ndisc.c
View File

@ -474,8 +474,7 @@ static void ndisc_send_skb(struct sk_buff *skb,
rcu_read_unlock(); rcu_read_unlock();
} }
void ndisc_send_na(struct net_device *dev, struct neighbour *neigh, void ndisc_send_na(struct net_device *dev, const struct in6_addr *daddr,
const struct in6_addr *daddr,
const struct in6_addr *solicited_addr, const struct in6_addr *solicited_addr,
bool router, bool solicited, bool override, bool inc_opt) bool router, bool solicited, bool override, bool inc_opt)
{ {
@ -541,7 +540,7 @@ static void ndisc_send_unsol_na(struct net_device *dev)
read_lock_bh(&idev->lock); read_lock_bh(&idev->lock);
list_for_each_entry(ifa, &idev->addr_list, if_list) { list_for_each_entry(ifa, &idev->addr_list, if_list) {
ndisc_send_na(dev, NULL, &in6addr_linklocal_allnodes, &ifa->addr, ndisc_send_na(dev, &in6addr_linklocal_allnodes, &ifa->addr,
/*router=*/ !!idev->cnf.forwarding, /*router=*/ !!idev->cnf.forwarding,
/*solicited=*/ false, /*override=*/ true, /*solicited=*/ false, /*override=*/ true,
/*inc_opt=*/ true); /*inc_opt=*/ true);
@ -551,8 +550,7 @@ static void ndisc_send_unsol_na(struct net_device *dev)
in6_dev_put(idev); in6_dev_put(idev);
} }
void ndisc_send_ns(struct net_device *dev, struct neighbour *neigh, void ndisc_send_ns(struct net_device *dev, const struct in6_addr *solicit,
const struct in6_addr *solicit,
const struct in6_addr *daddr, const struct in6_addr *saddr, const struct in6_addr *daddr, const struct in6_addr *saddr,
struct sk_buff *oskb) struct sk_buff *oskb)
{ {
@ -679,12 +677,12 @@ static void ndisc_solicit(struct neighbour *neigh, struct sk_buff *skb)
"%s: trying to ucast probe in NUD_INVALID: %pI6\n", "%s: trying to ucast probe in NUD_INVALID: %pI6\n",
__func__, target); __func__, target);
} }
ndisc_send_ns(dev, neigh, target, target, saddr, skb); ndisc_send_ns(dev, target, target, saddr, skb);
} else if ((probes -= NEIGH_VAR(neigh->parms, APP_PROBES)) < 0) { } else if ((probes -= NEIGH_VAR(neigh->parms, APP_PROBES)) < 0) {
neigh_app_ns(neigh); neigh_app_ns(neigh);
} else { } else {
addrconf_addr_solict_mult(target, &mcaddr); addrconf_addr_solict_mult(target, &mcaddr);
ndisc_send_ns(dev, NULL, target, &mcaddr, saddr, skb); ndisc_send_ns(dev, target, &mcaddr, saddr, skb);
} }
} }
@ -828,7 +826,7 @@ static void ndisc_recv_ns(struct sk_buff *skb)
is_router = idev->cnf.forwarding; is_router = idev->cnf.forwarding;
if (dad) { if (dad) {
ndisc_send_na(dev, NULL, &in6addr_linklocal_allnodes, &msg->target, ndisc_send_na(dev, &in6addr_linklocal_allnodes, &msg->target,
!!is_router, false, (ifp != NULL), true); !!is_router, false, (ifp != NULL), true);
goto out; goto out;
} }
@ -849,8 +847,7 @@ static void ndisc_recv_ns(struct sk_buff *skb)
NEIGH_UPDATE_F_WEAK_OVERRIDE| NEIGH_UPDATE_F_WEAK_OVERRIDE|
NEIGH_UPDATE_F_OVERRIDE); NEIGH_UPDATE_F_OVERRIDE);
if (neigh || !dev->header_ops) { if (neigh || !dev->header_ops) {
ndisc_send_na(dev, neigh, saddr, &msg->target, ndisc_send_na(dev, saddr, &msg->target, !!is_router,
!!is_router,
true, (ifp != NULL && inc), inc); true, (ifp != NULL && inc), inc);
if (neigh) if (neigh)
neigh_release(neigh); neigh_release(neigh);

2
net/ipv6/route.c
View File

@ -514,7 +514,7 @@ static void rt6_probe_deferred(struct work_struct *w)
container_of(w, struct __rt6_probe_work, work); container_of(w, struct __rt6_probe_work, work);
addrconf_addr_solict_mult(&work->target, &mcaddr); addrconf_addr_solict_mult(&work->target, &mcaddr);
ndisc_send_ns(work->dev, NULL, &work->target, &mcaddr, NULL, NULL); ndisc_send_ns(work->dev, &work->target, &mcaddr, NULL, NULL);
dev_put(work->dev); dev_put(work->dev);
kfree(work); kfree(work);
} }