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

Commit 2307f4a5 authored by YueHaibing's avatar YueHaibing Committed by David S. Miller
Browse files

net: hns3: Fix -Wunused-const-variable warning 



drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h:542:30:
 warning: meta_data_key_info defined but not used [-Wunused-const-variable=]
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h:553:30:
 warning: tuple_key_info defined but not used [-Wunused-const-variable=]

The two variable is only used in hclge_main.c,
so just move the definition over there.

Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f3acd33d

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

+44 −0
Original line number Diff line number Diff line
@@ -364,6 +364,50 @@ static const enum hclge_opcode_type hclge_dfx_reg_opcode_list[] = { 
	HCLGE_OPC_DFX_SSU_REG_2

};



static const struct key_info meta_data_key_info[] = {

	{ PACKET_TYPE_ID, 6},

	{ IP_FRAGEMENT, 1},

	{ ROCE_TYPE, 1},

	{ NEXT_KEY, 5},

	{ VLAN_NUMBER, 2},

	{ SRC_VPORT, 12},

	{ DST_VPORT, 12},

	{ TUNNEL_PACKET, 1},

};



static const struct key_info tuple_key_info[] = {

	{ OUTER_DST_MAC, 48},

	{ OUTER_SRC_MAC, 48},

	{ OUTER_VLAN_TAG_FST, 16},

	{ OUTER_VLAN_TAG_SEC, 16},

	{ OUTER_ETH_TYPE, 16},

	{ OUTER_L2_RSV, 16},

	{ OUTER_IP_TOS, 8},

	{ OUTER_IP_PROTO, 8},

	{ OUTER_SRC_IP, 32},

	{ OUTER_DST_IP, 32},

	{ OUTER_L3_RSV, 16},

	{ OUTER_SRC_PORT, 16},

	{ OUTER_DST_PORT, 16},

	{ OUTER_L4_RSV, 32},

	{ OUTER_TUN_VNI, 24},

	{ OUTER_TUN_FLOW_ID, 8},

	{ INNER_DST_MAC, 48},

	{ INNER_SRC_MAC, 48},

	{ INNER_VLAN_TAG_FST, 16},

	{ INNER_VLAN_TAG_SEC, 16},

	{ INNER_ETH_TYPE, 16},

	{ INNER_L2_RSV, 16},

	{ INNER_IP_TOS, 8},

	{ INNER_IP_PROTO, 8},

	{ INNER_SRC_IP, 32},

	{ INNER_DST_IP, 32},

	{ INNER_L3_RSV, 16},

	{ INNER_SRC_PORT, 16},

	{ INNER_DST_PORT, 16},

	{ INNER_L4_RSV, 32},

};



static int hclge_mac_update_stats_defective(struct hclge_dev *hdev)

{

#define HCLGE_MAC_CMD_NUM 21

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

+0 −44
Original line number Diff line number Diff line
@@ -539,50 +539,6 @@ struct key_info { 
	u8 key_length; /* use bit as unit */

};



static const struct key_info meta_data_key_info[] = {

	{ PACKET_TYPE_ID, 6},

	{ IP_FRAGEMENT, 1},

	{ ROCE_TYPE, 1},

	{ NEXT_KEY, 5},

	{ VLAN_NUMBER, 2},

	{ SRC_VPORT, 12},

	{ DST_VPORT, 12},

	{ TUNNEL_PACKET, 1},

};



static const struct key_info tuple_key_info[] = {

	{ OUTER_DST_MAC, 48},

	{ OUTER_SRC_MAC, 48},

	{ OUTER_VLAN_TAG_FST, 16},

	{ OUTER_VLAN_TAG_SEC, 16},

	{ OUTER_ETH_TYPE, 16},

	{ OUTER_L2_RSV, 16},

	{ OUTER_IP_TOS, 8},

	{ OUTER_IP_PROTO, 8},

	{ OUTER_SRC_IP, 32},

	{ OUTER_DST_IP, 32},

	{ OUTER_L3_RSV, 16},

	{ OUTER_SRC_PORT, 16},

	{ OUTER_DST_PORT, 16},

	{ OUTER_L4_RSV, 32},

	{ OUTER_TUN_VNI, 24},

	{ OUTER_TUN_FLOW_ID, 8},

	{ INNER_DST_MAC, 48},

	{ INNER_SRC_MAC, 48},

	{ INNER_VLAN_TAG_FST, 16},

	{ INNER_VLAN_TAG_SEC, 16},

	{ INNER_ETH_TYPE, 16},

	{ INNER_L2_RSV, 16},

	{ INNER_IP_TOS, 8},

	{ INNER_IP_PROTO, 8},

	{ INNER_SRC_IP, 32},

	{ INNER_DST_IP, 32},

	{ INNER_L3_RSV, 16},

	{ INNER_SRC_PORT, 16},

	{ INNER_DST_PORT, 16},

	{ INNER_L4_RSV, 32},

};



#define MAX_KEY_LENGTH	400

#define MAX_KEY_DWORDS	DIV_ROUND_UP(MAX_KEY_LENGTH / 8, 4)

#define MAX_KEY_BYTES	(MAX_KEY_DWORDS * 4)