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

Commit fb568637 authored by YOSHIFUJI Hideaki / 吉藤英明's avatar YOSHIFUJI Hideaki / 吉藤英明 Committed by David S. Miller
Browse files

ndisc: Make several arguments for ndisc_send_na() boolean. 



Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d1641565

net/ipv6/ndisc.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -490,7 +490,7 @@ static void __ndisc_send(struct net_device *dev, 
static void ndisc_send_na(struct net_device *dev, struct neighbour *neigh,

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

			  const struct in6_addr *daddr,

			  const struct in6_addr *daddr,

			  const struct in6_addr *solicited_addr,

			  const struct in6_addr *solicited_addr,

			  int router, int solicited, int override, int inc_opt)

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

{

{

	struct in6_addr tmpaddr;

	struct in6_addr tmpaddr;

	struct inet6_ifaddr *ifp;

	struct inet6_ifaddr *ifp;
@@ -776,11 +776,11 @@ static void ndisc_recv_ns(struct sk_buff *skb) 
	}

	}





	if (is_router < 0)

	if (is_router < 0)

		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, NULL, &in6addr_linklocal_allnodes, &msg->target,

			      is_router, 0, (ifp != NULL), 1);

			      !!is_router, false, (ifp != NULL), true);

		goto out;

		goto out;

	}

	}
@@ -801,8 +801,8 @@ static void ndisc_recv_ns(struct sk_buff *skb) 
			     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, neigh, saddr, &msg->target,

			      is_router,

			      !!is_router,

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

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

		if (neigh)

		if (neigh)

			neigh_release(neigh);

			neigh_release(neigh);

	}

	}