]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: hns3: Resume promisc mode and vlan filter status after reset
authorJian Shen <shenjian15@huawei.com>
Fri, 12 Oct 2018 14:34:05 +0000 (15:34 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 12 Oct 2018 18:23:45 +0000 (11:23 -0700)
This patch resumes promisc mode and vlan filter status after reset.

Signed-off-by: Jian Shen <shenjian15@huawei.com>
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

index bbd6197799f05fe1ddc6d4300c7c8dfdb5cad4cd..ce93fcce27322d3a40795c6253fd7039e1d48b4d 100644 (file)
@@ -3665,11 +3665,15 @@ static int hns3_reset_notify_init_enet(struct hnae3_handle *handle)
 {
        struct net_device *netdev = handle->kinfo.netdev;
        struct hns3_nic_priv *priv = netdev_priv(netdev);
+       bool vlan_filter_enable;
        int ret;
 
        hns3_init_mac_addr(netdev, false);
-       hns3_nic_set_rx_mode(netdev);
        hns3_recover_hw_addr(netdev);
+       hns3_update_promisc_mode(netdev, handle->netdev_flags);
+       vlan_filter_enable = netdev->flags & IFF_PROMISC ? false : true;
+       hns3_enable_vlan_filter(netdev, vlan_filter_enable);
+
 
        /* Hardware table is only clear when pf resets */
        if (!(handle->flags & HNAE3_SUPPORT_VF))