lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 1017/1039] net: ocelot: Fix the call to switchdev_bridge_port_offload
    Date
    From: Horatiu Vultur <horatiu.vultur@microchip.com>

    commit c0b7f7d7e0ad44f35745c01964b3fa2833e298cb upstream.

    In the blamed commit, the call to the function
    switchdev_bridge_port_offload was passing the wrong argument for
    atomic_nb. It was ocelot_netdevice_nb instead of ocelot_swtchdev_nb.
    This patch fixes this issue.

    Fixes: 4e51bf44a03af6 ("net: bridge: move the switchdev object replay helpers to "push" mode")
    Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
    Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/mscc/ocelot_net.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- a/drivers/net/ethernet/mscc/ocelot_net.c
    +++ b/drivers/net/ethernet/mscc/ocelot_net.c
    @@ -1168,7 +1168,7 @@ static int ocelot_netdevice_bridge_join(
    ocelot_port_bridge_join(ocelot, port, bridge);

    err = switchdev_bridge_port_offload(brport_dev, dev, priv,
    - &ocelot_netdevice_nb,
    + &ocelot_switchdev_nb,
    &ocelot_switchdev_blocking_nb,
    false, extack);
    if (err)
    @@ -1182,7 +1182,7 @@ static int ocelot_netdevice_bridge_join(

    err_switchdev_sync:
    switchdev_bridge_port_unoffload(brport_dev, priv,
    - &ocelot_netdevice_nb,
    + &ocelot_switchdev_nb,
    &ocelot_switchdev_blocking_nb);
    err_switchdev_offload:
    ocelot_port_bridge_leave(ocelot, port, bridge);
    @@ -1195,7 +1195,7 @@ static void ocelot_netdevice_pre_bridge_
    struct ocelot_port_private *priv = netdev_priv(dev);

    switchdev_bridge_port_unoffload(brport_dev, priv,
    - &ocelot_netdevice_nb,
    + &ocelot_switchdev_nb,
    &ocelot_switchdev_blocking_nb);
    }


    \
     
     \ /
      Last update: 2022-01-25 00:11    [W:4.099 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site