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

Commit f0e0d044 authored by Vasily Khoruzhick's avatar Vasily Khoruzhick Committed by David S. Miller
Browse files

neighbour: confirm neigh entries when ARP packet is received 



Update 'confirmed' timestamp when ARP packet is received. It shouldn't
affect locktime logic and anyway entry can be confirmed by any higher-layer
protocol. Thus it makes sense to confirm it when ARP packet is received.

Fixes: 77d71233 ("neighbour: update neigh timestamps iff update is effective")
Signed-off-by: default avatarVasily Khoruzhick <vasilykh@arista.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 56a49d70

net/core/neighbour.c

+8 −5
Original line number Original line Diff line number Diff line
@@ -1180,6 +1180,12 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new, 
		lladdr = neigh->ha;

		lladdr = neigh->ha;

	}

	}





	/* Update confirmed timestamp for neighbour entry after we

	 * received ARP packet even if it doesn't change IP to MAC binding.

	 */

	if (new & NUD_CONNECTED)

		neigh->confirmed = jiffies;



	/* If entry was valid and address is not changed,

	/* If entry was valid and address is not changed,

	   do not change entry state, if new one is STALE.

	   do not change entry state, if new one is STALE.

	 */

	 */
@@ -1201,15 +1207,12 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new, 
		}

		}

	}

	}





	/* Update timestamps only once we know we will make a change to the

	/* Update timestamp only once we know we will make a change to the

	 * neighbour entry. Otherwise we risk to move the locktime window with

	 * neighbour entry. Otherwise we risk to move the locktime window with

	 * noop updates and ignore relevant ARP updates.

	 * noop updates and ignore relevant ARP updates.

	 */

	 */

	if (new != old || lladdr != neigh->ha) {

	if (new != old || lladdr != neigh->ha)

		if (new & NUD_CONNECTED)

			neigh->confirmed = jiffies;

		neigh->updated = jiffies;

		neigh->updated = jiffies;

	}





	if (new != old) {

	if (new != old) {

		neigh_del_timer(neigh);

		neigh_del_timer(neigh);