Skip to content

Commit 189ce08

Browse files
Awik84Saeed Mahameed
authored andcommitted
net/mlx5e: Use generic name for the forwarding dev pointer
Rename tun_dev to fwd_dev within mlx5e_tc_update_priv struct since future implementation may introduce other device types which the handler is forwarding to. Signed-off-by: Ariel Levkovich <lariel@nvidia.com> Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
1 parent 28e7606 commit 189ce08

File tree

2 files changed

+5
-5
lines changed
  • drivers/net/ethernet/mellanox/mlx5/core

2 files changed

+5
-5
lines changed

drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -612,8 +612,8 @@ static bool mlx5e_restore_tunnel(struct mlx5e_priv *priv, struct sk_buff *skb,
612612
return false;
613613
}
614614

615-
/* Set tun_dev so we do dev_put() after datapath */
616-
tc_priv->tun_dev = dev;
615+
/* Set fwd_dev so we do dev_put() after datapath */
616+
tc_priv->fwd_dev = dev;
617617

618618
skb->dev = dev;
619619

@@ -655,8 +655,8 @@ static bool mlx5e_restore_skb_chain(struct sk_buff *skb, u32 chain, u32 reg_c1,
655655

656656
static void mlx5_rep_tc_post_napi_receive(struct mlx5e_tc_update_priv *tc_priv)
657657
{
658-
if (tc_priv->tun_dev)
659-
dev_put(tc_priv->tun_dev);
658+
if (tc_priv->fwd_dev)
659+
dev_put(tc_priv->fwd_dev);
660660
}
661661

662662
static void mlx5e_restore_skb_sample(struct mlx5e_priv *priv, struct sk_buff *skb,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
int mlx5e_tc_num_filters(struct mlx5e_priv *priv, unsigned long flags);
5757

5858
struct mlx5e_tc_update_priv {
59-
struct net_device *tun_dev;
59+
struct net_device *fwd_dev;
6060
};
6161

6262
struct mlx5_nic_flow_attr {

0 commit comments

Comments
 (0)