1 files changed, 26 insertions, 0 deletions

diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index 5b4cf9076bac..a31d280ffb6d 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -2020,6 +2020,31 @@ static void e1000_get_strings(struct net_device *netdev, u32 stringset,
         }
 }
 
+static int e1000e_set_flags(struct net_device *netdev, u32 data)
+{
+        struct e1000_adapter *adapter = netdev_priv(netdev);
+        bool need_reset = false;
+        int rc;
+
+        need_reset = (data & ETH_FLAG_RXVLAN) !=
+                     (netdev->features & NETIF_F_HW_VLAN_RX);
+
+        rc = ethtool_op_set_flags(netdev, data, ETH_FLAG_RXVLAN |
+                                  ETH_FLAG_TXVLAN);
+
+        if (rc)
+                return rc;
+
+        if (need_reset) {
+                if (netif_running(netdev))
+                        e1000e_reinit_locked(adapter);
+                else
+                        e1000e_reset(adapter);
+        }
+
+        return 0;
+}
+
 static const struct ethtool_ops e1000_ethtool_ops = {
         .get_settings           = e1000_get_settings,
         .set_settings           = e1000_set_settings,
@@ -2055,6 +2080,7 @@ static const struct ethtool_ops e1000_ethtool_ops = {
         .get_coalesce           = e1000_get_coalesce,
         .set_coalesce           = e1000_set_coalesce,
         .get_flags              = ethtool_op_get_flags,
+        .set_flags              = e1000e_set_flags,
 };
 
 void e1000e_set_ethtool_ops(struct net_device *netdev)