aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/e1000e/netdev.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/netdev.c')
-rw-r--r--drivers/net/ethernet/intel/e1000e/netdev.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index efb37290262d..a9a4ea2c616e 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -3262,6 +3262,7 @@ static void e1000e_set_rx_mode(struct net_device *netdev)
3262 e1000e_vlan_filter_disable(adapter); 3262 e1000e_vlan_filter_disable(adapter);
3263 } else { 3263 } else {
3264 int count; 3264 int count;
3265
3265 if (netdev->flags & IFF_ALLMULTI) { 3266 if (netdev->flags & IFF_ALLMULTI) {
3266 rctl |= E1000_RCTL_MPE; 3267 rctl |= E1000_RCTL_MPE;
3267 } else { 3268 } else {
@@ -6103,7 +6104,6 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
6103 const struct e1000_info *ei = e1000_info_tbl[ent->driver_data]; 6104 const struct e1000_info *ei = e1000_info_tbl[ent->driver_data];
6104 resource_size_t mmio_start, mmio_len; 6105 resource_size_t mmio_start, mmio_len;
6105 resource_size_t flash_start, flash_len; 6106 resource_size_t flash_start, flash_len;
6106
6107 static int cards_found; 6107 static int cards_found;
6108 u16 aspm_disable_flag = 0; 6108 u16 aspm_disable_flag = 0;
6109 int i, err, pci_using_dac; 6109 int i, err, pci_using_dac;
@@ -6347,11 +6347,11 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
6347 } else if (adapter->flags & FLAG_APME_IN_CTRL3) { 6347 } else if (adapter->flags & FLAG_APME_IN_CTRL3) {
6348 if (adapter->flags & FLAG_APME_CHECK_PORT_B && 6348 if (adapter->flags & FLAG_APME_CHECK_PORT_B &&
6349 (adapter->hw.bus.func == 1)) 6349 (adapter->hw.bus.func == 1))
6350 e1000_read_nvm(&adapter->hw, 6350 e1000_read_nvm(&adapter->hw, NVM_INIT_CONTROL3_PORT_B,
6351 NVM_INIT_CONTROL3_PORT_B, 1, &eeprom_data); 6351 1, &eeprom_data);
6352 else 6352 else
6353 e1000_read_nvm(&adapter->hw, 6353 e1000_read_nvm(&adapter->hw, NVM_INIT_CONTROL3_PORT_A,
6354 NVM_INIT_CONTROL3_PORT_A, 1, &eeprom_data); 6354 1, &eeprom_data);
6355 } 6355 }
6356 6356
6357 /* fetch WoL from EEPROM */ 6357 /* fetch WoL from EEPROM */