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

Commit fc6e8073 authored by Roopa Prabhu's avatar Roopa Prabhu Committed by David S. Miller
Browse files

neighbour: send netlink notification if NTF_ROUTER changes 



send netlink notification if neigh_update results in NTF_ROUTER
change and if NEIGH_UPDATE_F_ISROUTER is on. Also move the
NTF_ROUTER change function into a helper.

Signed-off-by: default avatarRoopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f7aa74e4

include/net/neighbour.h

+15 −0
Original line number Diff line number Diff line
@@ -544,4 +544,19 @@ static inline void neigh_update_ext_learned(struct neighbour *neigh, u32 flags, 
		*notify = 1;

	}

}



static inline void neigh_update_is_router(struct neighbour *neigh, u32 flags,

					  int *notify)

{

	u8 ndm_flags = 0;



	ndm_flags |= (flags & NEIGH_UPDATE_F_ISROUTER) ? NTF_ROUTER : 0;

	if ((neigh->flags ^ ndm_flags) & NTF_ROUTER) {

		if (ndm_flags & NTF_ROUTER)

			neigh->flags |= NTF_ROUTER;

		else

			neigh->flags &= ~NTF_ROUTER;

		*notify = 1;

	}

}

#endif

net/core/neighbour.c

+2 −5
Original line number Diff line number Diff line
@@ -1280,11 +1280,8 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new, 
		neigh->arp_queue_len_bytes = 0;

	}

out:

	if (update_isrouter) {

		neigh->flags = (flags & NEIGH_UPDATE_F_ISROUTER) ?

			(neigh->flags | NTF_ROUTER) :

			(neigh->flags & ~NTF_ROUTER);

	}

	if (update_isrouter)

		neigh_update_is_router(neigh, flags, &notify);

	write_unlock_bh(&neigh->lock);



	if (notify)