mlxsw: Add extack to mlxsw_sp_nve_ops.fdb_replay

A follow-up patch will extend vxlan_fdb_replay() with an extack
argument. Extend the fdb_replay callback in mlxsw likewise so that the
argument is ready for the vxlan conversion.

Signed-off-by: Petr Machata <petrm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c
index 9019548d731b219b06d86ddd39ce5458a06691d8..94e07767f18ed2c12d91df63b52c65b9a348b8d5 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c
@@ -841,7 +841,7 @@ int mlxsw_sp_nve_fid_enable(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_fid *fid,
 
        nve->config = config;
 
-       err = ops->fdb_replay(params->dev, params->vni);
+       err = ops->fdb_replay(params->dev, params->vni, extack);
        if (err) {
                NL_SET_ERR_MSG_MOD(extack, "Failed to offload the FDB");
                goto err_fdb_replay;

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.h
index 02937ea95bc317ea0c6eef707c6a634afd774d29..20d99b41611db891964ee4dc896ef9da5199a2ae 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.h
@@ -41,7 +41,8 @@ struct mlxsw_sp_nve_ops {
        int (*init)(struct mlxsw_sp_nve *nve,
                    const struct mlxsw_sp_nve_config *config);
        void (*fini)(struct mlxsw_sp_nve *nve);
-       int (*fdb_replay)(const struct net_device *nve_dev, __be32 vni);
+       int (*fdb_replay)(const struct net_device *nve_dev, __be32 vni,
+                         struct netlink_ext_ack *extack);
        void (*fdb_clear_offload)(const struct net_device *nve_dev, __be32 vni);
 };
 

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c
index 74e564c4ac1996d1fa01eade5c31667677f4b38a..bc565f2aa121a6c295acfd2f8e76e434b1a8f232 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c
@@ -212,7 +212,8 @@ static void mlxsw_sp1_nve_vxlan_fini(struct mlxsw_sp_nve *nve)
 }
 
 static int
-mlxsw_sp_nve_vxlan_fdb_replay(const struct net_device *nve_dev, __be32 vni)
+mlxsw_sp_nve_vxlan_fdb_replay(const struct net_device *nve_dev, __be32 vni,
+                             struct netlink_ext_ack *extack)
 {
        if (WARN_ON(!netif_is_vxlan(nve_dev)))
                return -EINVAL;