e100, e1000 fixes
Subsystems (2)
PATCH 1/1 e100, e1000 fixes
The e100 fix finally fixes the netconsole problems.
The e1000 fixes look pretty safe, but don't have hardware at the moment to test. A non-Intel list member verified the e1000 stuff at least works for him.
Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git upstream-linus
to receive the following updates:
drivers/net/e100.c | 10 +++++++-- drivers/net/e1000/e1000_ethtool.c | 4 +++- drivers/net/e1000/e1000_hw.h | 6 +++-- drivers/net/e1000/e1000_main.c | 41 +++++++++++++++++++++++++------------ 4 files changed, 42 insertions(+), 19 deletions(-)
Auke Kok:
e1000: FIX: 82542 doesn't support WoL
e1000: Increment version to 7.2.9-k4
e100: account for closed interface when shutting downBruce Allan:
e1000: FIX: fix wrong txdctl threshold bitmasks
Jesse Brandeburg:
e1000: FIX: don't poke at manageability registers for incompatible adapters
e1000: FIX: Disable Packet Split for non jumbo frames
e1000: FIX: Don't limit descriptor size to 4kb for PCI-E adapters
e1000: FIX: move length adjustment due to crc stripping disabled.
drivers/net/e100.c +8 -2
@@ -2719,7 +2719,10 @@ static int e100_suspend(struct pci_dev *struct net_device *netdev =pci_get_drvdata (pdev);struct nic *nic =netdev_priv (netdev); -netif_poll_disable (nic->netdev); +#ifdef CONFIG_E100_NAPI +if (netif_running (netdev)) +netif_poll_disable (nic->netdev); +#endif del_timer_sync (&nic->watchdog);netif_carrier_off (nic->netdev);
@@ -2763,7 +2766,10 @@ static void e100_shutdown(struct pci_devstruct net_device *netdev =pci_get_drvdata (pdev);struct nic *nic =netdev_priv (netdev); -netif_poll_disable (nic->netdev); +#ifdef CONFIG_E100_NAPI +if (netif_running (netdev)) +netif_poll_disable (nic->netdev); +#endif del_timer_sync (&nic->watchdog);netif_carrier_off (nic->netdev);
drivers/net/e1000/e1000_ethtool.c +3 -1
@@ -461,7 +461,8 @@ e1000_get_regs(struct net_device *netdev regs_buff[24 ] = (uint32_t )phy_data;/* phy local receiver status */ regs_buff[25 ] = regs_buff[24 ];/* phy remote receiver status */ if (hw->mac_type >= e1000_82540 && - hw->media_type == e1000_media_type_copper) { + hw->mac_type < e1000_82571 && + hw->media_type == e1000_media_type_copper) { regs_buff[26 ] =E1000_READ_REG (hw,MANC ); } }
@@ -1690,6 +1691,7 @@ static int e1000_wol_exclusion(struct e1int retval =1 ;/* fail by default */ switch (hw->device_id) { +case E1000_DEV_ID_82542 :case E1000_DEV_ID_82543GC_FIBER :case E1000_DEV_ID_82543GC_COPPER :case E1000_DEV_ID_82544EI_FIBER :
drivers/net/e1000/e1000_hw.h +3 -3
@@ -1961,9 +1961,9 @@ #define E1000_RXDCTL_WTHRESH 0x003F0000#define E1000_RXDCTL_GRAN 0x01000000/* RXDCTL Granularity */ /* Transmit Descriptor Control */ -#define E1000_TXDCTL_PTHRESH 0x000000FF/* TXDCTL Prefetch Threshold */ -#define E1000_TXDCTL_HTHRESH 0x0000FF00/* TXDCTL Host Threshold */ -#define E1000_TXDCTL_WTHRESH 0x00FF0000/* TXDCTL Writeback Threshold */ +#define E1000_TXDCTL_PTHRESH 0x0000003F/* TXDCTL Prefetch Threshold */ +#define E1000_TXDCTL_HTHRESH 0x00003F00/* TXDCTL Host Threshold */ +#define E1000_TXDCTL_WTHRESH 0x003F0000/* TXDCTL Writeback Threshold */ #define E1000_TXDCTL_GRAN 0x01000000/* TXDCTL Granularity */ #define E1000_TXDCTL_LWTHRESH 0xFE000000/* TXDCTL Low Threshold */ #define E1000_TXDCTL_FULL_TX_DESC_WB 0x01010000/* GRAN=1, WTHRESH=1 */
drivers/net/e1000/e1000_main.c +28 -13
102 lines not on this page · raw message