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

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

mpls: fix clearing of dead nh_flags on link up 



recent fixes to use WRITE_ONCE for nh_flags on link up,
accidently ended up leaving the deadflags on a nh. This patch
fixes the WRITE_ONCE to use freshly evaluated nh_flags.

Fixes: 39eb8cd1 ("net: mpls: rt_nhn_alive and nh_flags should be accessed using READ_ONCE")
Reported-by: default avatarSatish Ashok <sashok@cumulusnetworks.com>
Signed-off-by: default avatarRoopa Prabhu <roopa@cumulusnetworks.com>
Acked-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e8f4ae85

net/mpls/af_mpls.c

+1 −1
Original line number Diff line number Diff line
@@ -1418,7 +1418,7 @@ static void mpls_ifup(struct net_device *dev, unsigned int flags) 
				continue;

			alive++;

			nh_flags &= ~flags;

			WRITE_ONCE(nh->nh_flags, flags);

			WRITE_ONCE(nh->nh_flags, nh_flags);

		} endfor_nexthops(rt);



		WRITE_ONCE(rt->rt_nhn_alive, alive);