lkml.org 
[lkml]   [2021]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 092/242] net: hsr: dont check sequence number if tag removal is offloaded
    Date
    From: George McCollister <george.mccollister@gmail.com>

    [ Upstream commit c2ae34a7deaff463ecafb7db627b77faaca8e159 ]

    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>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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.30.2


    \
     
     \ /
      Last update: 2021-07-15 21:10    [W:3.764 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site