All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH net-next] net: hsr: don't check sequence number if tag removal is offloaded
@ 2021-06-15 17:50 George McCollister
  2021-06-16 19:20 ` patchwork-bot+netdevbpf
  0 siblings, 1 reply; 2+ messages in thread
From: George McCollister @ 2021-06-15 17:50 UTC (permalink / raw)
  To: netdev
  Cc: David S. Miller, Jakub Kicinski, Murali Karicheri, Andrew Lunn,
	Marco Wenzel, linux-kernel, George McCollister

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: George McCollister <george.mccollister@gmail.com>
---
 net/hsr/hsr_framereg.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/hsr/hsr_framereg.c b/net/hsr/hsr_framereg.c
index bb1351c38397..e31949479305 100644
--- a/net/hsr/hsr_framereg.c
+++ b/net/hsr/hsr_framereg.c
@@ -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;
-- 
2.11.0


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH net-next] net: hsr: don't check sequence number if tag removal is offloaded
  2021-06-15 17:50 [PATCH net-next] net: hsr: don't check sequence number if tag removal is offloaded George McCollister
@ 2021-06-16 19:20 ` patchwork-bot+netdevbpf
  0 siblings, 0 replies; 2+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-06-16 19:20 UTC (permalink / raw)
  To: George McCollister
  Cc: netdev, davem, kuba, m-karicheri2, andrew, marco.wenzel, linux-kernel

Hello:

This patch was applied to netdev/net-next.git (refs/heads/master):

On Tue, 15 Jun 2021 12:50:37 -0500 you wrote:
> 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: George McCollister <george.mccollister@gmail.com>
> 
> [...]

Here is the summary with links:
  - [net-next] net: hsr: don't check sequence number if tag removal is offloaded
    https://git.kernel.org/netdev/net-next/c/c2ae34a7deaf

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-06-16 19:20 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-15 17:50 [PATCH net-next] net: hsr: don't check sequence number if tag removal is offloaded George McCollister
2021-06-16 19:20 ` patchwork-bot+netdevbpf

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.