aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTushar Dave <tushar.n.dave@intel.com>2012-06-12 09:03:29 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2012-06-20 04:08:44 -0400
commit7500673be30f9467cd1a0e065c93e75c5213b44d (patch)
tree77a18ccc8e8569199e0d3e1b434c1cb5f5e2f38b /drivers
parent41063e9dd11956f2d285e12e4342e1d232ba0ea2 (diff)
e1000: Combining Bitwise OR in one expression.
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/intel/e1000/e1000_main.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 7483ca0a6282..183a4a3224ba 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -1078,18 +1078,18 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
1078 netdev->priv_flags |= IFF_SUPP_NOFCS; 1078 netdev->priv_flags |= IFF_SUPP_NOFCS;
1079 1079
1080 netdev->features |= netdev->hw_features; 1080 netdev->features |= netdev->hw_features;
1081 netdev->hw_features |= NETIF_F_RXCSUM; 1081 netdev->hw_features |= (NETIF_F_RXCSUM |
1082 netdev->hw_features |= NETIF_F_RXALL; 1082 NETIF_F_RXALL |
1083 netdev->hw_features |= NETIF_F_RXFCS; 1083 NETIF_F_RXFCS);
1084 1084
1085 if (pci_using_dac) { 1085 if (pci_using_dac) {
1086 netdev->features |= NETIF_F_HIGHDMA; 1086 netdev->features |= NETIF_F_HIGHDMA;
1087 netdev->vlan_features |= NETIF_F_HIGHDMA; 1087 netdev->vlan_features |= NETIF_F_HIGHDMA;
1088 } 1088 }
1089 1089
1090 netdev->vlan_features |= NETIF_F_TSO; 1090 netdev->vlan_features |= (NETIF_F_TSO |
1091 netdev->vlan_features |= NETIF_F_HW_CSUM; 1091 NETIF_F_HW_CSUM |
1092 netdev->vlan_features |= NETIF_F_SG; 1092 NETIF_F_SG);
1093 1093
1094 netdev->priv_flags |= IFF_UNICAST_FLT; 1094 netdev->priv_flags |= IFF_UNICAST_FLT;
1095 1095