Commit 181d454b authored by Jian Shen's avatar Jian Shen Committed by David S. Miller
Browse files

net: hns3: add feature check when feature changed 



Local variable "changed" was defined to indicates features changed,
but was used only for feature NETIF_F_HW_VLAN_CTAG_RX. Add checking
for other features.

Fixes: 052ece6d ("net: hns3: add ethtool related offload command")
Signed-off-by: default avatarJian Shen <shenjian15@huawei.com>
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 11af96a4

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

+15 −12
Original line number Diff line number Diff line
@@ -1118,11 +1118,12 @@ static int hns3_nic_net_set_mac_address(struct net_device *netdev, void *p) 
static int hns3_nic_set_features(struct net_device *netdev,

				 netdev_features_t features)

{

	netdev_features_t changed = netdev->features ^ features;

	struct hns3_nic_priv *priv = netdev_priv(netdev);

	struct hnae3_handle *h = priv->ae_handle;

	netdev_features_t changed;

	int ret;



	if (changed & (NETIF_F_TSO | NETIF_F_TSO6)) {

		if (features & (NETIF_F_TSO | NETIF_F_TSO6)) {

			priv->ops.fill_desc = hns3_fill_desc_tso;

			priv->ops.maybe_stop_tx = hns3_nic_maybe_stop_tso;
@@ -1130,13 +1131,15 @@ static int hns3_nic_set_features(struct net_device *netdev, 
			priv->ops.fill_desc = hns3_fill_desc;

			priv->ops.maybe_stop_tx = hns3_nic_maybe_stop_tx;

		}

	}



	if (changed & NETIF_F_HW_VLAN_CTAG_FILTER) {

		if (features & NETIF_F_HW_VLAN_CTAG_FILTER)

			h->ae_algo->ops->enable_vlan_filter(h, true);

		else

			h->ae_algo->ops->enable_vlan_filter(h, false);

	}



	changed = netdev->features ^ features;

	if (changed & NETIF_F_HW_VLAN_CTAG_RX) {

		if (features & NETIF_F_HW_VLAN_CTAG_RX)

			ret = h->ae_algo->ops->enable_hw_strip_rxvtag(h, true);

CRA Git | Maintained and supported by SUSTech CRA and CCSE