Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba60a356 authored by Hadar Hen Zion's avatar Hadar Hen Zion Committed by Roland Dreier
Browse files

mlx4_core: Change a few DMFS fields names to match firmare spec 



Change struct mlx4_net_trans_rule_hw_eth :: vlan_id name to vlan_tag

Change struct mlx4_net_trans_rule_hw_ib :: r_u_qpn name to l3_qpn

The patch doesn't introduce any functional change or API change
towards the firmware.

Signed-off-by: default avatarHadar Hen Zion <hadarh@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent f9162539

drivers/net/ethernet/mellanox/mlx4/mcg.c

+3 −3
Original line number Diff line number Diff line
@@ -714,12 +714,12 @@ static int parse_trans_rule(struct mlx4_dev *dev, struct mlx4_spec_list *spec, 
			rule_hw->eth.ether_type_enable = 1;

			rule_hw->eth.ether_type = spec->eth.ether_type;

		}

		rule_hw->eth.vlan_id = spec->eth.vlan_id;

		rule_hw->eth.vlan_id_msk = spec->eth.vlan_id_msk;

		rule_hw->eth.vlan_tag = spec->eth.vlan_id;

		rule_hw->eth.vlan_tag_msk = spec->eth.vlan_id_msk;

		break;



	case MLX4_NET_TRANS_RULE_ID_IB:

		rule_hw->ib.qpn = spec->ib.r_qpn;

		rule_hw->ib.l3_qpn = spec->ib.l3_qpn;

		rule_hw->ib.qpn_mask = spec->ib.qpn_msk;

		memcpy(&rule_hw->ib.dst_gid, &spec->ib.dst_gid, 16);

		memcpy(&rule_hw->ib.dst_gid_msk, &spec->ib.dst_gid_msk, 16);

include/linux/mlx4/device.h

+4 −4
Original line number Diff line number Diff line
@@ -930,7 +930,7 @@ struct mlx4_spec_ipv4 { 
};



struct mlx4_spec_ib {

	__be32	r_qpn;

	__be32  l3_qpn;

	__be32	qpn_msk;

	u8	dst_gid[16];

	u8	dst_gid_msk[16];
@@ -978,7 +978,7 @@ struct mlx4_net_trans_rule_hw_ib { 
	u8 rsvd1;

	__be16 id;

	u32 rsvd2;

	__be32 qpn;

	__be32 l3_qpn;

	__be32 qpn_mask;

	u8 dst_gid[16];

	u8 dst_gid_msk[16];
@@ -999,8 +999,8 @@ struct mlx4_net_trans_rule_hw_eth { 
	u8      rsvd5;

	u8      ether_type_enable;

	__be16  ether_type;

	__be16  vlan_id_msk;

	__be16  vlan_id;

	__be16  vlan_tag_msk;

	__be16  vlan_tag;

} __packed;



struct mlx4_net_trans_rule_hw_tcp_udp {