Bonding fixes for Ocelot switch
Subsystems (3)
cover Bonding fixes for Ocelot switch
This series fixes 2 issues with bonding in a system that integrates the ocelot driver, but the ports that are bonded do not actually belong to ocelot.
Claudiu Manoil (2):
net: mscc: ocelot: don't handle netdev events for other netdevs
net: mscc: ocelot: fix NULL pointer on LAG slave removal
drivers/net/ethernet/mscc/ocelot.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/2 net: mscc: ocelot: don't handle netdev events for other netdevs
From: Claudiu Manoil <[email protected]>
The check that the event is actually for this device should be moved from the "port" handler to the net device handler.
Otherwise the port handler will deny bonding configuration for other net devices in the same system (like enetc in the LS1028A) that don't have the lag_upper_info->tx_type restriction that ocelot has.
--- drivers/net/ethernet/mscc/ocelot.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/mscc/ocelot.c +3 -3
@@ -1680,9 +1680,6 @@ static int ocelot_netdevice_port_event(struct net_device *dev,struct ocelot_port *ocelot_port =netdev_priv (dev);int err =0 ; -if (!ocelot_netdevice_dev_check (dev)) -return 0 ; -switch (event) {case NETDEV_CHANGEUPPER :if (netif_is_bridge_master (info->upper_dev)) {
@@ -1719,6 +1716,9 @@ static int ocelot_netdevice_event(struct notifier_block *unused,struct net_device *dev =netdev_notifier_info_to_dev (ptr);int ret =0 ; +if (!ocelot_netdevice_dev_check (dev)) +return 0 ; +if (event ==NETDEV_PRECHANGEUPPER &&netif_is_lag_master (info->upper_dev)) {struct netdev_lag_upper_info *lag_upper_info = info->upper_info;
Signature · 1 line
2.17.1
PATCH 2/2 net: mscc: ocelot: fix NULL pointer on LAG slave removal
In reply to Vladimir OlteanFrom: Claudiu Manoil <[email protected]>
lag_upper_info may be NULL on slave removal.
--- drivers/net/ethernet/mscc/ocelot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/mscc/ocelot.c +2 -1
@@ -1724,7 +1724,8 @@ static int ocelot_netdevice_event(struct notifier_block *unused,struct netdev_lag_upper_info *lag_upper_info = info->upper_info;struct netlink_ext_ack *extack; -if (lag_upper_info->tx_type !=NETDEV_LAG_TX_TYPE_HASH ) { +if (lag_upper_info && + lag_upper_info->tx_type !=NETDEV_LAG_TX_TYPE_HASH ) { extack =netdev_notifier_info_to_extack (&info->info);NL_SET_ERR_MSG_MOD (extack,"LAG device using unsupported Tx type" );
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Vladimir Oltean <[email protected]>
Date: Tue, 5 Nov 2019 23:50:12 +0200
Quoted 3 lines
This series fixes 2 issues with bonding in a system that integrates the ocelot driver, but the ports that are bonded do not actually belong to ocelot.
Series applied and queued up for -stable.