From: Andrew Morton Signed-off-by: Andrew Morton --- drivers/net/cxgb3/cxgb3_main.c | 5 +++-- drivers/net/sky2.c | 8 ++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff -puN drivers/net/cxgb3/cxgb3_main.c~git-net-fixup drivers/net/cxgb3/cxgb3_main.c --- a/drivers/net/cxgb3/cxgb3_main.c~git-net-fixup +++ a/drivers/net/cxgb3/cxgb3_main.c @@ -1500,10 +1500,11 @@ static int get_eeprom(struct net_device static int set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom, u8 * data) { + struct port_info *pi = netdev_priv(dev); + struct adapter *adapter = pi->adapter; + u32 aligned_offset, aligned_len, *p; u8 *buf; int err; - u32 aligned_offset, aligned_len, *p; - struct adapter *adapter = dev->priv; if (eeprom->magic != EEPROM_MAGIC) return -EINVAL; diff -puN drivers/net/ehea/ehea_main.c~git-net-fixup drivers/net/ehea/ehea_main.c diff -puN drivers/net/sky2.c~git-net-fixup drivers/net/sky2.c --- a/drivers/net/sky2.c~git-net-fixup +++ a/drivers/net/sky2.c @@ -2518,12 +2518,8 @@ static void sky2_watchdog(unsigned long struct sky2_hw *hw = (struct sky2_hw *) arg; /* Look for lost IRQ */ - if (sky2_read32(hw, B0_ISRC)) { - struct net_device *dev = hw->dev[0]; - - if (__netif_rx_schedule_prep(dev)) - __netif_rx_schedule(dev); - } + if (sky2_read32(hw, B0_ISRC)) + napi_schedule(&hw->napi); /* Snapshot current system realtime at current timestamp value * @ 150Mhz counter wraps in 28.6 secs _