Commit 38212bb3 authored May 01, 2020 by Roman Mashak Committed by David S. Miller May 05, 2020

neigh: send protocol value in neighbor create notification



When a new neighbor entry has been added, event is generated but it does not
include protocol, because its value is assigned after the event notification
routine has run, so move protocol assignment code earlier.

Fixes: df9b0e30 ("neighbor: Add protocol attribute")
Cc: David Ahern <dsahern@gmail.com>
Signed-off-by: Roman Mashak <mrv@mojatatu.com>
Reviewed-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 755f5738

net/core/neighbour.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1956,6 +1956,9 @@ static int neigh_add(struct sk_buff skb, struct nlmsghdr nlh,
		NEIGH_UPDATE_F_OVERRIDE_ISROUTER);
		}

		if (protocol)
		neigh->protocol = protocol;

		if (ndm->ndm_flags & NTF_EXT_LEARNED)
		flags \|= NEIGH_UPDATE_F_EXT_LEARNED;

		@@ -1969,9 +1972,6 @@ static int neigh_add(struct sk_buff skb, struct nlmsghdr nlh,
		err = __neigh_update(neigh, lladdr, ndm->ndm_state, flags,
		NETLINK_CB(skb).portid, extack);

		if (protocol)
		neigh->protocol = protocol;

		neigh_release(neigh);

		out:

Admin message