Skip to content

Commit 069448b

Browse files
Lama KayalSaeed Mahameed
Lama Kayal
authored and
Saeed Mahameed
committed
net/mlx5e: Move mlx5e_init_l2_addr to en_main
Move the function declaration of mlx5e_init_l2_addr to en/fs.h, rename to mlx5e_fs_init_l2_addr to align with the fs API functions naming convention and let it take mlx5e_flow_steering as arguments while keeping implementation at en_fs.c file. This helps maintain a clean driver code and avoids unnecessary dependencies. Signed-off-by: Lama Kayal <[email protected]> Reviewed-by: Tariq Toukan <[email protected]> Signed-off-by: Saeed Mahameed <[email protected]>
1 parent a02c07e commit 069448b

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

drivers/net/ethernet/mellanox/mlx5/core/en.h

-1
Original file line numberDiff line numberDiff line change
@@ -1024,7 +1024,6 @@ void mlx5e_shampo_dealloc_hd(struct mlx5e_rq *rq, u16 len, u16 start, bool close
10241024
void mlx5e_get_stats(struct net_device *dev, struct rtnl_link_stats64 *stats);
10251025
void mlx5e_fold_sw_stats64(struct mlx5e_priv *priv, struct rtnl_link_stats64 *s);
10261026

1027-
void mlx5e_init_l2_addr(struct mlx5e_priv *priv);
10281027
int mlx5e_self_test_num(struct mlx5e_priv *priv);
10291028
int mlx5e_self_test_fill_strings(struct mlx5e_priv *priv, u8 *data);
10301029
void mlx5e_self_test(struct net_device *ndev, struct ethtool_test *etest,

drivers/net/ethernet/mellanox/mlx5/core/en/fs.h

+1
Original file line numberDiff line numberDiff line change
@@ -197,5 +197,6 @@ int mlx5e_fs_vlan_rx_add_vid(struct mlx5e_flow_steering *fs,
197197
int mlx5e_fs_vlan_rx_kill_vid(struct mlx5e_flow_steering *fs,
198198
struct net_device *netdev,
199199
__be16 proto, u16 vid);
200+
void mlx5e_fs_init_l2_addr(struct mlx5e_flow_steering *fs, struct net_device *netdev);
200201
#endif /* __MLX5E_FLOW_STEER_H__ */
201202

drivers/net/ethernet/mellanox/mlx5/core/en_fs.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -843,9 +843,9 @@ static void mlx5e_destroy_groups(struct mlx5e_flow_table *ft)
843843
ft->num_groups = 0;
844844
}
845845

846-
void mlx5e_init_l2_addr(struct mlx5e_priv *priv)
846+
void mlx5e_fs_init_l2_addr(struct mlx5e_flow_steering *fs, struct net_device *netdev)
847847
{
848-
ether_addr_copy(priv->fs->l2.broadcast.addr, priv->netdev->broadcast);
848+
ether_addr_copy(fs->l2.broadcast.addr, netdev->broadcast);
849849
}
850850

851851
void mlx5e_destroy_flow_table(struct mlx5e_flow_table *ft)

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -5186,7 +5186,7 @@ static void mlx5e_nic_enable(struct mlx5e_priv *priv)
51865186
struct net_device *netdev = priv->netdev;
51875187
struct mlx5_core_dev *mdev = priv->mdev;
51885188

5189-
mlx5e_init_l2_addr(priv);
5189+
mlx5e_fs_init_l2_addr(priv->fs, netdev);
51905190

51915191
/* Marking the link as currently not needed by the Driver */
51925192
if (!netif_running(netdev))

drivers/net/ethernet/mellanox/mlx5/core/en_rep.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@ static int mlx5e_init_rep_rx(struct mlx5e_priv *priv)
849849
goto err_free_fs;
850850
}
851851

852-
mlx5e_init_l2_addr(priv);
852+
mlx5e_fs_init_l2_addr(priv->fs, priv->netdev);
853853

854854
err = mlx5e_open_drop_rq(priv, &priv->drop_rq);
855855
if (err) {

0 commit comments

Comments
 (0)