Skip to content

Commit a514d17

Browse files
w1ldptrSaeed Mahameed
authored andcommitted
net/mlx5: Bridge, obtain core device from eswitch instead of priv
Following patches in series will pass bond device to bridge, which means the code can't assume the device is mlx5 representor. Moreover, the core device can be easily obtained from eswitch instance, so there is no reason for more complex code that obtains struct mlx5_priv from net_device in order to use its mdev. Refactor the code to use esw->dev instead of priv->mdev. Signed-off-by: Vlad Buslov <[email protected]> Reviewed-by: Roi Dayan <[email protected]> Reviewed-by: Mark Bloch <[email protected]> Signed-off-by: Saeed Mahameed <[email protected]>
1 parent 4de20e9 commit a514d17

File tree

1 file changed

+2
-4
lines changed
  • drivers/net/ethernet/mellanox/mlx5/core/esw

1 file changed

+2
-4
lines changed

drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,6 @@ mlx5_esw_bridge_fdb_entry_init(struct net_device *dev, u16 vport_num, const unsi
912912
struct mlx5_esw_bridge_fdb_entry *entry;
913913
struct mlx5_flow_handle *handle;
914914
struct mlx5_fc *counter;
915-
struct mlx5e_priv *priv;
916915
int err;
917916

918917
if (bridge->flags & MLX5_ESW_BRIDGE_VLAN_FILTERING_FLAG && vid) {
@@ -921,7 +920,6 @@ mlx5_esw_bridge_fdb_entry_init(struct net_device *dev, u16 vport_num, const unsi
921920
return ERR_CAST(vlan);
922921
}
923922

924-
priv = netdev_priv(dev);
925923
entry = kvzalloc(sizeof(*entry), GFP_KERNEL);
926924
if (!entry)
927925
return ERR_PTR(-ENOMEM);
@@ -934,7 +932,7 @@ mlx5_esw_bridge_fdb_entry_init(struct net_device *dev, u16 vport_num, const unsi
934932
if (added_by_user)
935933
entry->flags |= MLX5_ESW_BRIDGE_FLAG_ADDED_BY_USER;
936934

937-
counter = mlx5_fc_create(priv->mdev, true);
935+
counter = mlx5_fc_create(esw->dev, true);
938936
if (IS_ERR(counter)) {
939937
err = PTR_ERR(counter);
940938
goto err_ingress_fc_create;
@@ -994,7 +992,7 @@ mlx5_esw_bridge_fdb_entry_init(struct net_device *dev, u16 vport_num, const unsi
994992
err_ingress_filter_flow_create:
995993
mlx5_del_flow_rules(entry->ingress_handle);
996994
err_ingress_flow_create:
997-
mlx5_fc_destroy(priv->mdev, entry->ingress_counter);
995+
mlx5_fc_destroy(esw->dev, entry->ingress_counter);
998996
err_ingress_fc_create:
999997
kvfree(entry);
1000998
return ERR_PTR(err);

0 commit comments

Comments
 (0)