openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'hns3-next' 

Huazhong Tan says:

====================
net: hns3: adds some cleanups for -next

There are some cleanups for the HNS3 ethernet driver, fix an
incorrect print format, an incorrect comment and some coding
style issues, also remove some unused codes and macros.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2020-05-30 17:41:22 -07:00
parent bc183dec08 996aade998
commit da4e15e31b
6 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
View File

@ -1544,12 +1544,6 @@ static int hns3_nic_set_features(struct net_device *netdev,
return ret; return ret;
} }
if ((changed & NETIF_F_HW_VLAN_CTAG_FILTER) &&
h->ae_algo->ops->enable_vlan_filter) {
enable = !!(features & NETIF_F_HW_VLAN_CTAG_FILTER);
h->ae_algo->ops->enable_vlan_filter(h, enable);
}
if ((changed & NETIF_F_HW_VLAN_CTAG_RX) && if ((changed & NETIF_F_HW_VLAN_CTAG_RX) &&
h->ae_algo->ops->enable_hw_strip_rxvtag) { h->ae_algo->ops->enable_hw_strip_rxvtag) {
enable = !!(features & NETIF_F_HW_VLAN_CTAG_RX); enable = !!(features & NETIF_F_HW_VLAN_CTAG_RX);

2
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c
View File

@ -11,8 +11,6 @@
#include "hnae3.h" #include "hnae3.h"
#include "hclge_main.h" #include "hclge_main.h"
#define hclge_is_csq(ring) ((ring)->flag & HCLGE_TYPE_CSQ)
#define cmq_ring_to_dev(ring) (&(ring)->dev->pdev->dev) #define cmq_ring_to_dev(ring) (&(ring)->dev->pdev->dev)
static int hclge_ring_space(struct hclge_cmq_ring *ring) static int hclge_ring_space(struct hclge_cmq_ring *ring)

2
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c
View File

@ -155,7 +155,7 @@ int hclge_mac_mdio_config(struct hclge_dev *hdev)
ret = mdiobus_register(mdio_bus); ret = mdiobus_register(mdio_bus);
if (ret) { if (ret) {
dev_err(mdio_bus->parent, dev_err(mdio_bus->parent,
"Failed to register MDIO bus ret = %#x\n", ret); "failed to register MDIO bus, ret = %d\n", ret);
return ret; return ret;
} }

3
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c
View File

@ -11,9 +11,6 @@
#include "hclgevf_main.h" #include "hclgevf_main.h"
#include "hnae3.h" #include "hnae3.h"
#define hclgevf_is_csq(ring) ((ring)->flag & HCLGEVF_TYPE_CSQ)
#define hclgevf_ring_to_dma_dir(ring) (hclgevf_is_csq(ring) ? \
DMA_TO_DEVICE : DMA_FROM_DEVICE)
#define cmq_ring_to_dev(ring) (&(ring)->dev->pdev->dev) #define cmq_ring_to_dev(ring) (&(ring)->dev->pdev->dev)
static int hclgevf_ring_space(struct hclgevf_cmq_ring *ring) static int hclgevf_ring_space(struct hclgevf_cmq_ring *ring)

3
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
View File

@ -669,8 +669,8 @@ static int hclgevf_set_rss_tc_mode(struct hclgevf_dev *hdev, u16 rss_size)
u16 tc_size[HCLGEVF_MAX_TC_NUM]; u16 tc_size[HCLGEVF_MAX_TC_NUM];
struct hclgevf_desc desc; struct hclgevf_desc desc;
u16 roundup_size; u16 roundup_size;
int status;
unsigned int i; unsigned int i;
int status;
req = (struct hclgevf_rss_tc_mode_cmd *)desc.data; req = (struct hclgevf_rss_tc_mode_cmd *)desc.data;
@ -1143,7 +1143,6 @@ static int hclgevf_cmd_set_promisc_mode(struct hclgevf_dev *hdev,
send_msg.en_mc = en_mc_pmc ? 1 : 0; send_msg.en_mc = en_mc_pmc ? 1 : 0;
ret = hclgevf_send_mbx_msg(hdev, &send_msg, false, NULL, 0); ret = hclgevf_send_mbx_msg(hdev, &send_msg, false, NULL, 0);
if (ret) if (ret)
dev_err(&hdev->pdev->dev, dev_err(&hdev->pdev->dev,
"Set promisc mode fail, status is %d.\n", ret); "Set promisc mode fail, status is %d.\n", ret);

2
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h
View File

@ -278,7 +278,7 @@ struct hclgevf_dev {
struct semaphore reset_sem; /* protect reset process */ struct semaphore reset_sem; /* protect reset process */
u32 fw_version; u32 fw_version;
u16 num_tqps; /* num task queue pairs of this PF */ u16 num_tqps; /* num task queue pairs of this VF */
u16 alloc_rss_size; /* allocated RSS task queue */ u16 alloc_rss_size; /* allocated RSS task queue */
u16 rss_size_max; /* HW defined max RSS task queue */ u16 rss_size_max; /* HW defined max RSS task queue */