UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Tushar Dave 2012-06-12 13:03:29 +00:00 committed by Jeff Kirsher
parent 41063e9dd1
commit 7500673be3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/ethernet/intel/e1000/e1000_main.c
View File

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