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

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: default avatarDavid S. Miller <davem@davemloft.net>
parents bc183dec 996aade9

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+0 −6
Original line number Diff line number Diff line
@@ -1544,12 +1544,6 @@ static int hns3_nic_set_features(struct net_device *netdev, 
			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) &&

	    h->ae_algo->ops->enable_hw_strip_rxvtag) {

		enable = !!(features & NETIF_F_HW_VLAN_CTAG_RX);

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

+0 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ 
#include "hnae3.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)



static int hclge_ring_space(struct hclge_cmq_ring *ring)

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

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ int hclge_mac_mdio_config(struct hclge_dev *hdev) 
	ret = mdiobus_register(mdio_bus);

	if (ret) {

		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;

	}

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c

+0 −3
Original line number Diff line number Diff line
@@ -11,9 +11,6 @@ 
#include "hclgevf_main.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)



static int hclgevf_ring_space(struct hclgevf_cmq_ring *ring)

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c

+1 −2
Original line number Diff line number Diff line
@@ -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];

	struct hclgevf_desc desc;

	u16 roundup_size;

	int status;

	unsigned int i;

	int status;



	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;



	ret = hclgevf_send_mbx_msg(hdev, &send_msg, false, NULL, 0);



	if (ret)

		dev_err(&hdev->pdev->dev,

			"Set promisc mode fail, status is %d.\n", ret);

CRA Git | Maintained and supported by SUSTech CRA and CCSE