e1000: Combining Bitwise OR in one expression.
authorTushar Dave <tushar.n.dave@intel.com>
Tue, 12 Jun 2012 13:03:29 +0000 (13:03 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 20 Jun 2012 08:08:44 +0000 (01:08 -0700)
Signed-off-by: Tushar Dave <tushar.n.dave@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/e1000/e1000_main.c

index 7483ca0a6282f8e2111c44ca67a0518c8edba661..183a4a3224ba8e90a216d78c30b6407da6e3e632 100644 (file)
@@ -1078,18 +1078,18 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
        netdev->priv_flags |= IFF_SUPP_NOFCS;
 
        netdev->features |= netdev->hw_features;
-       netdev->hw_features |= NETIF_F_RXCSUM;
-       netdev->hw_features |= NETIF_F_RXALL;
-       netdev->hw_features |= NETIF_F_RXFCS;
+       netdev->hw_features |= (NETIF_F_RXCSUM |
+                               NETIF_F_RXALL |
+                               NETIF_F_RXFCS);
 
        if (pci_using_dac) {
                netdev->features |= NETIF_F_HIGHDMA;
                netdev->vlan_features |= NETIF_F_HIGHDMA;
        }
 
-       netdev->vlan_features |= NETIF_F_TSO;
-       netdev->vlan_features |= NETIF_F_HW_CSUM;
-       netdev->vlan_features |= NETIF_F_SG;
+       netdev->vlan_features |= (NETIF_F_TSO |
+                                 NETIF_F_HW_CSUM |
+                                 NETIF_F_SG);
 
        netdev->priv_flags |= IFF_UNICAST_FLT;