Commit 1707be1b authored by David S. Miller's avatar David S. Miller

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-2.6

parents f3d7bc57 4def99bb
...@@ -42,7 +42,8 @@ ...@@ -42,7 +42,8 @@
#define GBE_CONFIG_RAM_BASE \ #define GBE_CONFIG_RAM_BASE \
((unsigned int)(CONFIG_RAM_BASE + GBE_CONFIG_OFFSET)) ((unsigned int)(CONFIG_RAM_BASE + GBE_CONFIG_OFFSET))
#define GBE_CONFIG_BASE_VIRT phys_to_virt(GBE_CONFIG_RAM_BASE) #define GBE_CONFIG_BASE_VIRT \
((void __iomem *)phys_to_virt(GBE_CONFIG_RAM_BASE))
#define GBE_CONFIG_FLASH_WRITE(base, offset, count, data) \ #define GBE_CONFIG_FLASH_WRITE(base, offset, count, data) \
(iowrite16_rep(base + offset, data, count)) (iowrite16_rep(base + offset, data, count))
......
...@@ -5967,7 +5967,8 @@ static int __devinit e1000_probe(struct pci_dev *pdev, ...@@ -5967,7 +5967,8 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
/* APME bit in EEPROM is mapped to WUC.APME */ /* APME bit in EEPROM is mapped to WUC.APME */
eeprom_data = er32(WUC); eeprom_data = er32(WUC);
eeprom_apme_mask = E1000_WUC_APME; eeprom_apme_mask = E1000_WUC_APME;
if (eeprom_data & E1000_WUC_PHY_WAKE) if ((hw->mac.type > e1000_ich10lan) &&
(eeprom_data & E1000_WUC_PHY_WAKE))
adapter->flags2 |= FLAG2_HAS_PHY_WAKEUP; adapter->flags2 |= FLAG2_HAS_PHY_WAKEUP;
} else if (adapter->flags & FLAG_APME_IN_CTRL3) { } else if (adapter->flags & FLAG_APME_IN_CTRL3) {
if (adapter->flags & FLAG_APME_CHECK_PORT_B && if (adapter->flags & FLAG_APME_CHECK_PORT_B &&
......
...@@ -220,7 +220,7 @@ static u32 e1000_hash_mc_addr_vf(struct e1000_hw *hw, u8 *mc_addr) ...@@ -220,7 +220,7 @@ static u32 e1000_hash_mc_addr_vf(struct e1000_hw *hw, u8 *mc_addr)
* The parameter rar_count will usually be hw->mac.rar_entry_count * The parameter rar_count will usually be hw->mac.rar_entry_count
* unless there are workarounds that change this. * unless there are workarounds that change this.
**/ **/
void e1000_update_mc_addr_list_vf(struct e1000_hw *hw, static void e1000_update_mc_addr_list_vf(struct e1000_hw *hw,
u8 *mc_addr_list, u32 mc_addr_count, u8 *mc_addr_list, u32 mc_addr_count,
u32 rar_used_count, u32 rar_count) u32 rar_used_count, u32 rar_count)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment