Skip to content

Commit 47a1a22

Browse files
committed
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: David S. Miller <[email protected]>
2 parents c7cf89b + 2566f10 commit 47a1a22

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6964,15 +6964,17 @@ int hclge_update_port_base_vlan_cfg(struct hclge_vport *vport, u16 state,
69646964

69656965
if (state == HNAE3_PORT_BASE_VLAN_MODIFY) {
69666966
/* add new VLAN tag */
6967-
ret = hclge_set_vlan_filter_hw(hdev, vlan_info->vlan_proto,
6967+
ret = hclge_set_vlan_filter_hw(hdev,
6968+
htons(vlan_info->vlan_proto),
69686969
vport->vport_id,
69696970
vlan_info->vlan_tag,
69706971
vlan_info->qos, false);
69716972
if (ret)
69726973
return ret;
69736974

69746975
/* remove old VLAN tag */
6975-
ret = hclge_set_vlan_filter_hw(hdev, old_vlan_info->vlan_proto,
6976+
ret = hclge_set_vlan_filter_hw(hdev,
6977+
htons(old_vlan_info->vlan_proto),
69766978
vport->vport_id,
69776979
old_vlan_info->vlan_tag,
69786980
old_vlan_info->qos, true);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -854,7 +854,7 @@ struct hclge_vport {
854854
u16 alloc_rss_size;
855855

856856
u16 qs_offset;
857-
u16 bw_limit; /* VSI BW Limit (0 = disabled) */
857+
u32 bw_limit; /* VSI BW Limit (0 = disabled) */
858858
u8 dwrr;
859859

860860
struct hclge_port_base_vlan_config port_base_vlan_cfg;

0 commit comments

Comments
 (0)