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

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
...@@ -1118,25 +1118,28 @@ static int hns3_nic_net_set_mac_address(struct net_device *netdev, void *p) ...@@ -1118,25 +1118,28 @@ static int hns3_nic_net_set_mac_address(struct net_device *netdev, void *p)
static int hns3_nic_set_features(struct net_device *netdev, static int hns3_nic_set_features(struct net_device *netdev,
netdev_features_t features) netdev_features_t features)
{ {
netdev_features_t changed = netdev->features ^ features;
struct hns3_nic_priv *priv = netdev_priv(netdev); struct hns3_nic_priv *priv = netdev_priv(netdev);
struct hnae3_handle *h = priv->ae_handle; struct hnae3_handle *h = priv->ae_handle;
netdev_features_t changed;
int ret; int ret;
if (features & (NETIF_F_TSO | NETIF_F_TSO6)) { if (changed & (NETIF_F_TSO | NETIF_F_TSO6)) {
priv->ops.fill_desc = hns3_fill_desc_tso; if (features & (NETIF_F_TSO | NETIF_F_TSO6)) {
priv->ops.maybe_stop_tx = hns3_nic_maybe_stop_tso; priv->ops.fill_desc = hns3_fill_desc_tso;
} else { priv->ops.maybe_stop_tx = hns3_nic_maybe_stop_tso;
priv->ops.fill_desc = hns3_fill_desc; } else {
priv->ops.maybe_stop_tx = hns3_nic_maybe_stop_tx; priv->ops.fill_desc = hns3_fill_desc;
priv->ops.maybe_stop_tx = hns3_nic_maybe_stop_tx;
}
} }
if (features & NETIF_F_HW_VLAN_CTAG_FILTER) if (changed & NETIF_F_HW_VLAN_CTAG_FILTER) {
h->ae_algo->ops->enable_vlan_filter(h, true); if (features & NETIF_F_HW_VLAN_CTAG_FILTER)
else h->ae_algo->ops->enable_vlan_filter(h, true);
h->ae_algo->ops->enable_vlan_filter(h, false); else
h->ae_algo->ops->enable_vlan_filter(h, false);
}
changed = netdev->features ^ features;
if (changed & NETIF_F_HW_VLAN_CTAG_RX) { if (changed & NETIF_F_HW_VLAN_CTAG_RX) {
if (features & 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); ret = h->ae_algo->ops->enable_hw_strip_rxvtag(h, true);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment