Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38cf595b authored by Jiri Benc's avatar Jiri Benc Committed by David S. Miller
Browse files

ipv6: remove unused neigh parameter from ndisc functions 



Since commit 12fd84f4 ("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: default avatarJiri Benc <jbenc@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 92c14d9b

drivers/net/usb/cdc_mbim.c

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ static void do_neigh_solicit(struct usbnet *dev, u8 *buf, u16 tci) 
	in6_dev_put(in6_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 */,

				 true /* solicited */,

				 false /* override */,

include/net/addrconf.h

+1 −2
Original line number Diff line number Diff line
@@ -192,8 +192,7 @@ struct ipv6_stub { 
	int (*ipv6_dst_lookup)(struct net *net, struct sock *sk,

			       struct dst_entry **dst, struct flowi6 *fl6);

	void (*udpv6_encap_enable)(void);

	void (*ndisc_send_na)(struct net_device *dev, struct neighbour *neigh,

			      const struct in6_addr *daddr,

	void (*ndisc_send_na)(struct net_device *dev, const struct in6_addr *daddr,

			      const struct in6_addr *solicited_addr,

			      bool router, bool solicited, bool override, bool inc_opt);

	struct neigh_table *nd_tbl;

include/net/ndisc.h

+2 −4
Original line number Diff line number Diff line
@@ -180,15 +180,13 @@ void ndisc_cleanup(void); 


int ndisc_rcv(struct sk_buff *skb);



void ndisc_send_ns(struct net_device *dev, struct neighbour *neigh,

		   const struct in6_addr *solicit,

void ndisc_send_ns(struct net_device *dev, const struct in6_addr *solicit,

		   const struct in6_addr *daddr, const struct in6_addr *saddr,

		   struct sk_buff *oskb);



void ndisc_send_rs(struct net_device *dev,

		   const struct in6_addr *saddr, const struct in6_addr *daddr);

void ndisc_send_na(struct net_device *dev, struct neighbour *neigh,

		   const struct in6_addr *daddr,

void ndisc_send_na(struct net_device *dev, const struct in6_addr *daddr,

		   const struct in6_addr *solicited_addr,

		   bool router, bool solicited, bool override, bool inc_opt);

net/ipv6/addrconf.c

+1 −1
Original line number Diff line number Diff line
@@ -3625,7 +3625,7 @@ static void addrconf_dad_work(struct work_struct *w) 


	/* send a neighbour solicitation for our addr */

	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:

	in6_ifa_put(ifp);

	rtnl_unlock();

net/ipv6/ndisc.c

+7 −10
Original line number Diff line number Diff line
@@ -474,8 +474,7 @@ static void ndisc_send_skb(struct sk_buff *skb, 
	rcu_read_unlock();

}



void ndisc_send_na(struct net_device *dev, struct neighbour *neigh,

		   const struct in6_addr *daddr,

void ndisc_send_na(struct net_device *dev, const struct in6_addr *daddr,

		   const struct in6_addr *solicited_addr,

		   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);

	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,

			      /*solicited=*/ false, /*override=*/ true,

			      /*inc_opt=*/ true);
@@ -551,8 +550,7 @@ static void ndisc_send_unsol_na(struct net_device *dev) 
	in6_dev_put(idev);

}



void ndisc_send_ns(struct net_device *dev, struct neighbour *neigh,

		   const struct in6_addr *solicit,

void ndisc_send_ns(struct net_device *dev, const struct in6_addr *solicit,

		   const struct in6_addr *daddr, const struct in6_addr *saddr,

		   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",

				  __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) {

		neigh_app_ns(neigh);

	} else {

		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;



	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);

		goto out;

	}
@@ -849,8 +847,7 @@ static void ndisc_recv_ns(struct sk_buff *skb) 
			     NEIGH_UPDATE_F_WEAK_OVERRIDE|

			     NEIGH_UPDATE_F_OVERRIDE);

	if (neigh || !dev->header_ops) {

		ndisc_send_na(dev, neigh, saddr, &msg->target,

			      !!is_router,

		ndisc_send_na(dev, saddr, &msg->target, !!is_router,

			      true, (ifp != NULL && inc), inc);

		if (neigh)

			neigh_release(neigh);