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

Commit 47a1a225 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'hns3-next' 



Huazhong Tan says:

====================
net: hns3: fixes sparse: warning and type error

This patchset fixes a sparse warning and a overflow problem.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c7cf89b5 2566f106

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

+4 −2
Original line number Diff line number Diff line
@@ -6964,7 +6964,8 @@ int hclge_update_port_base_vlan_cfg(struct hclge_vport *vport, u16 state, 


	if (state == HNAE3_PORT_BASE_VLAN_MODIFY) {

		/* add new VLAN tag */

		ret = hclge_set_vlan_filter_hw(hdev, vlan_info->vlan_proto,

		ret = hclge_set_vlan_filter_hw(hdev,

					       htons(vlan_info->vlan_proto),

					       vport->vport_id,

					       vlan_info->vlan_tag,

					       vlan_info->qos, false);
@@ -6972,7 +6973,8 @@ int hclge_update_port_base_vlan_cfg(struct hclge_vport *vport, u16 state, 
			return ret;



		/* remove old VLAN tag */

		ret = hclge_set_vlan_filter_hw(hdev, old_vlan_info->vlan_proto,

		ret = hclge_set_vlan_filter_hw(hdev,

					       htons(old_vlan_info->vlan_proto),

					       vport->vport_id,

					       old_vlan_info->vlan_tag,

					       old_vlan_info->qos, true);

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h

+1 −1
Original line number Diff line number Diff line
@@ -854,7 +854,7 @@ struct hclge_vport { 
	u16 alloc_rss_size;



	u16 qs_offset;

	u16 bw_limit;		/* VSI BW Limit (0 = disabled) */

	u32 bw_limit;		/* VSI BW Limit (0 = disabled) */

	u8  dwrr;



	struct hclge_port_base_vlan_config port_base_vlan_cfg;