Commit c2ae34a7 authored by George McCollister's avatar George McCollister Committed by David S. Miller
Browse files

net: hsr: don't check sequence number if tag removal is offloaded 



Don't check the sequence number when deciding when to update time_in in
the node table if tag removal is offloaded since the sequence number is
part of the tag. This fixes a problem where the times in the node table
wouldn't update when 0 appeared to be before or equal to seq_out when
tag removal was offloaded.

Signed-off-by: default avatarGeorge McCollister <george.mccollister@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 61273f9d

net/hsr/hsr_framereg.c

+2 −1
Original line number Diff line number Diff line
@@ -397,7 +397,8 @@ void hsr_register_frame_in(struct hsr_node *node, struct hsr_port *port, 
	 * ensures entries of restarted nodes gets pruned so that they can

	 * re-register and resume communications.

	 */

	if (seq_nr_before(sequence_nr, node->seq_out[port->type]))

	if (!(port->dev->features & NETIF_F_HW_HSR_TAG_RM) &&

	    seq_nr_before(sequence_nr, node->seq_out[port->type]))

		return;



	node->time_in[port->type] = jiffies;