aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Tantilov <emil.s.tantilov@intel.com>2015-01-27 22:21:13 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2015-02-05 22:58:42 -0500
commit39f35a370b59d65506bbfb8f9c1b9362d58b44fe (patch)
tree9dbf20842439f605f522e7e8b7b45fe1c786e157
parent3f207800a998fb1b0b36df251e826ee7682294f7 (diff)
ixgbevf: set vlan_features in a single write instead of several ORs
Clean up the setting of vlan_features by enabling all features at once. Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com> Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index a5735263b1de..6d24aa57ce3c 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -3873,11 +3873,11 @@ static int ixgbevf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
3873 NETIF_F_HW_VLAN_CTAG_RX | 3873 NETIF_F_HW_VLAN_CTAG_RX |
3874 NETIF_F_HW_VLAN_CTAG_FILTER; 3874 NETIF_F_HW_VLAN_CTAG_FILTER;
3875 3875
3876 netdev->vlan_features |= NETIF_F_TSO; 3876 netdev->vlan_features |= NETIF_F_TSO |
3877 netdev->vlan_features |= NETIF_F_TSO6; 3877 NETIF_F_TSO6 |
3878 netdev->vlan_features |= NETIF_F_IP_CSUM; 3878 NETIF_F_IP_CSUM |
3879 netdev->vlan_features |= NETIF_F_IPV6_CSUM; 3879 NETIF_F_IPV6_CSUM |
3880 netdev->vlan_features |= NETIF_F_SG; 3880 NETIF_F_SG;
3881 3881
3882 if (pci_using_dac) 3882 if (pci_using_dac)
3883 netdev->features |= NETIF_F_HIGHDMA; 3883 netdev->features |= NETIF_F_HIGHDMA;