1 files changed, 1 insertions, 11 deletions

diff --git a/drivers/net/ixgbevf/ixgbevf_main.c b/drivers/net/ixgbevf/ixgbevf_main.c
index 4867440ecfa8..3e291ccc629d 100644
--- a/drivers/net/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ixgbevf/ixgbevf_main.c
@@ -1463,18 +1463,10 @@ static void ixgbevf_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
 {
         struct ixgbevf_adapter *adapter = netdev_priv(netdev);
         struct ixgbe_hw *hw = &adapter->hw;
-        struct net_device *v_netdev;
 
         /* add VID to filter table */
         if (hw->mac.ops.set_vfta)
                 hw->mac.ops.set_vfta(hw, vid, 0, true);
-        /*
-         * Copy feature flags from netdev to the vlan netdev for this vid.
-         * This allows things like TSO to bubble down to our vlan device.
-         */
-        v_netdev = vlan_group_get_device(adapter->vlgrp, vid);
-        v_netdev->features |= adapter->netdev->features;
-        vlan_group_set_device(adapter->vlgrp, vid, v_netdev);
 }
 
 static void ixgbevf_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
@@ -3402,7 +3394,6 @@ static int __devinit ixgbevf_probe(struct pci_dev *pdev,
         /* setup the private structure */
         err = ixgbevf_sw_init(adapter);
 
-#ifdef MAX_SKB_FRAGS
         netdev->features = NETIF_F_SG |
                            NETIF_F_IP_CSUM |
                            NETIF_F_HW_VLAN_TX |
@@ -3416,13 +3407,12 @@ static int __devinit ixgbevf_probe(struct pci_dev *pdev,
         netdev->vlan_features |= NETIF_F_TSO;
         netdev->vlan_features |= NETIF_F_TSO6;
         netdev->vlan_features |= NETIF_F_IP_CSUM;
+        netdev->vlan_features |= NETIF_F_IPV6_CSUM;
         netdev->vlan_features |= NETIF_F_SG;
 
         if (pci_using_dac)
                 netdev->features |= NETIF_F_HIGHDMA;
 
-#endif /* MAX_SKB_FRAGS */
-
         /* The HW MAC address was set and/or determined in sw_init */
         memcpy(netdev->dev_addr, adapter->hw.mac.addr, netdev->addr_len);
         memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);