diff options
| author | Ido Schimmel | 2018-10-11 09:47:53 +0200 |
|---|---|---|
| committer | David S. Miller | 2018-10-11 19:08:22 +0200 |
| commit | 9c73b1d120aadf26a3bbf34841ddac73b29c0326 (patch) | |
| tree | 5cc802e37a84c2e57f92ccd08ece3c555b355231 /drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c | |
| parent | mlxsw: spectrum_switchdev: Check notification relevance based on upper device (diff) | |
| download | kernel-qcow2-linux-9c73b1d120aadf26a3bbf34841ddac73b29c0326.tar.gz kernel-qcow2-linux-9c73b1d120aadf26a3bbf34841ddac73b29c0326.tar.xz kernel-qcow2-linux-9c73b1d120aadf26a3bbf34841ddac73b29c0326.zip | |
mlxsw: spectrum_switchdev: Do not assume notifier information type
VxLAN notifications are going to use a different notifier information
type, so cast to the correct type based on the received event.
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Reviewed-by: Petr Machata <petrm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c index 9edaec95ddd2..fa16ad2c6a50 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c @@ -2343,7 +2343,8 @@ static int mlxsw_sp_switchdev_event(struct notifier_block *unused, { struct net_device *dev = switchdev_notifier_info_to_dev(ptr); struct mlxsw_sp_switchdev_event_work *switchdev_work; - struct switchdev_notifier_fdb_info *fdb_info = ptr; + struct switchdev_notifier_fdb_info *fdb_info; + struct switchdev_notifier_info *info = ptr; struct net_device *br_dev; /* Tunnel devices are not our uppers, so check their master instead */ @@ -2367,6 +2368,9 @@ static int mlxsw_sp_switchdev_event(struct notifier_block *unused, case SWITCHDEV_FDB_DEL_TO_DEVICE: /* fall through */ case SWITCHDEV_FDB_ADD_TO_BRIDGE: /* fall through */ case SWITCHDEV_FDB_DEL_TO_BRIDGE: + fdb_info = container_of(info, + struct switchdev_notifier_fdb_info, + info); INIT_WORK(&switchdev_work->work, mlxsw_sp_switchdev_bridge_fdb_event_work); memcpy(&switchdev_work->fdb_info, ptr, |