[net-next 08/13] net/mlx5e: Vxlan, rename struct mlx5e_vxlan to mlx5_vxlan_port

Saeed Mahameed
2018-07-27T22:40:47Z

The name mlx5e_vxlan will be used in downstream patch to describe
mlx5 vxlan structure that will replace mlx5e_vxlan_db.

Hence we rename struct mlx5e_vxlan to mlx5_vxlan_port which describes a
mlx5 vxlan port.

Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Reviewed-by: Or Gerlitz <ogerlitz@mellanox.com>
---
.../net/ethernet/mellanox/mlx5/core/vxlan.c | 62 +++++++++----------
.../net/ethernet/mellanox/mlx5/core/vxlan.h | 4 +-
2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/vxlan.c b/drivers/net/ethernet/mellanox/mlx5/core/vxlan.c
index 2a25c2dd6e6f..95e3140da65c 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/vxlan.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/vxlan.c
@@ -36,7 +36,7 @@
#include "mlx5_core.h"
#include "vxlan.h"

-struct mlx5e_vxlan {
+struct mlx5_vxlan_port {
struct hlist_node hlist;
atomic_t refcount;
u16 udp_port;
@@ -83,40 +83,40 @@ static int mlx5e_vxlan_core_del_port_cmd(struct mlx5_core_dev *mdev, u16 port)
return mlx5_cmd_exec(mdev, in, sizeof(in), out, sizeof(out));
}

-static struct mlx5e_vxlan *mlx5e_vxlan_lookup_port_locked(struct mlx5e_priv *priv,
- u16 port)
+static struct mlx5_vxlan_port*
+mlx5e_vxlan_lookup_port_locked(struct mlx5e_priv *priv, u16 port)
{
struct mlx5e_vxlan_db *vxlan_db = &priv->vxlan;
- struct mlx5e_vxlan *vxlan;
+ struct mlx5_vxlan_port *vxlanp;

- hash_for_each_possible(vxlan_db->htable, vxlan, hlist, port) {
- if (vxlan->udp_port == port)
- return vxlan;
+ hash_for_each_possible(vxlan_db->htable, vxlanp, hlist, port) {
+ if (vxlanp->udp_port == port)
+ return vxlanp;
}

return NULL;
}

-struct mlx5e_vxlan *mlx5e_vxlan_lookup_port(struct mlx5e_priv *priv, u16 port)
+struct mlx5_vxlan_port *mlx5e_vxlan_lookup_port(struct mlx5e_priv *priv, u16 port)
{
struct mlx5e_vxlan_db *vxlan_db = &priv->vxlan;
- struct mlx5e_vxlan *vxlan;
+ struct mlx5_vxlan_port *vxlanp;

read_lock_bh(&vxlan_db->lock);
- vxlan = mlx5e_vxlan_lookup_port_locked(priv, port);
+ vxlanp = mlx5e_vxlan_lookup_port_locked(priv, port);
read_unlock_bh(&vxlan_db->lock);

- return vxlan;
+ return vxlanp;
}

void mlx5e_vxlan_add_port(struct mlx5e_priv *priv, u16 port)
{
struct mlx5e_vxlan_db *vxlan_db = &priv->vxlan;
- struct mlx5e_vxlan *vxlan;
+ struct mlx5_vxlan_port *vxlanp;

- vxlan = mlx5e_vxlan_lookup_port(priv, port);
- if (vxlan) {
- atomic_inc(&vxlan->refcount);
+ vxlanp = mlx5e_vxlan_lookup_port(priv, port);
+ if (vxlanp) {
+ atomic_inc(&vxlanp->refcount);
return;
}

@@ -130,15 +130,15 @@ void mlx5e_vxlan_add_port(struct mlx5e_priv *priv, u16 port)
if (mlx5e_vxlan_core_add_port_cmd(priv->mdev, port))
return;

- vxlan = kzalloc(sizeof(*vxlan), GFP_KERNEL);
- if (!vxlan)
+ vxlanp = kzalloc(sizeof(*vxlanp), GFP_KERNEL);
+ if (!vxlanp)
goto err_delete_port;

- vxlan->udp_port = port;
- atomic_set(&vxlan->refcount, 1);
+ vxlanp->udp_port = port;
+ atomic_set(&vxlanp->refcount, 1);

write_lock_bh(&vxlan_db->lock);
- hash_add(vxlan_db->htable, &vxlan->hlist, port);
+ hash_add(vxlan_db->htable, &vxlanp->hlist, port);
write_unlock_bh(&vxlan_db->lock);

vxlan_db->num_ports++;
@@ -151,16 +151,16 @@ void mlx5e_vxlan_add_port(struct mlx5e_priv *priv, u16 port)
void mlx5e_vxlan_del_port(struct mlx5e_priv *priv, u16 port)
{
struct mlx5e_vxlan_db *vxlan_db = &priv->vxlan;
- struct mlx5e_vxlan *vxlan;
+ struct mlx5_vxlan_port *vxlanp;
bool remove = false;

write_lock_bh(&vxlan_db->lock);
- vxlan = mlx5e_vxlan_lookup_port_locked(priv, port);
- if (!vxlan)
+ vxlanp = mlx5e_vxlan_lookup_port_locked(priv, port);
+ if (!vxlanp)
goto out_unlock;

- if (atomic_dec_and_test(&vxlan->refcount)) {
- hash_del(&vxlan->hlist);
+ if (atomic_dec_and_test(&vxlanp->refcount)) {
+ hash_del(&vxlanp->hlist);
remove = true;
}

@@ -169,7 +169,7 @@ void mlx5e_vxlan_del_port(struct mlx5e_priv *priv, u16 port)

if (remove) {
mlx5e_vxlan_core_del_port_cmd(priv->mdev, port);
- kfree(vxlan);
+ kfree(vxlanp);
vxlan_db->num_ports--;
}
}
@@ -177,14 +177,14 @@ void mlx5e_vxlan_del_port(struct mlx5e_priv *priv, u16 port)
void mlx5e_vxlan_cleanup(struct mlx5e_priv *priv)
{
struct mlx5e_vxlan_db *vxlan_db = &priv->vxlan;
- struct mlx5e_vxlan *vxlan;
+ struct mlx5_vxlan_port *vxlanp;
struct hlist_node *tmp;
int bkt;

/* Lockless since we are the only hash table consumers, wq and TX are disabled */
- hash_for_each_safe(vxlan_db->htable, bkt, tmp, vxlan, hlist) {
- hash_del(&vxlan->hlist);
- mlx5e_vxlan_core_del_port_cmd(priv->mdev, vxlan->udp_port);
- kfree(vxlan);
+ hash_for_each_safe(vxlan_db->htable, bkt, tmp, vxlanp, hlist) {
+ hash_del(&vxlanp->hlist);
+ mlx5e_vxlan_core_del_port_cmd(priv->mdev, vxlanp->udp_port);
+ kfree(vxlanp);
}
}
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/vxlan.h b/drivers/net/ethernet/mellanox/mlx5/core/vxlan.h
index 1a02f5b38009..6b38b6fbd030 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/vxlan.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/vxlan.h
@@ -35,7 +35,7 @@
#include <linux/mlx5/driver.h>
#include "en.h"

-struct mlx5e_vxlan;
+struct mlx5_vxlan_port;

static inline bool mlx5e_vxlan_allowed(struct mlx5_core_dev *mdev)
{
@@ -47,6 +47,6 @@ void mlx5e_vxlan_init(struct mlx5e_priv *priv);
void mlx5e_vxlan_cleanup(struct mlx5e_priv *priv);
void mlx5e_vxlan_add_port(struct mlx5e_priv *priv, u16 port);
void mlx5e_vxlan_del_port(struct mlx5e_priv *priv, u16 port);
-struct mlx5e_vxlan *mlx5e_vxlan_lookup_port(struct mlx5e_priv *priv, u16 port);
+struct mlx5_vxlan_port *mlx5e_vxlan_lookup_port(struct mlx5e_priv *priv, u16 port);

#endif /* __MLX5_VXLAN_H__ */
--
2.17.0