[git patches] regression fixes for .27-rc

Previous thread: [PATCH] netdev: simple_tx_hash shouldn't hash inside fragments by Alexander Duyck on Thursday, September 18, 2008 - 8:43 pm. (2 messages)

Next thread: [GIT]: Networking by David Miller on Thursday, September 18, 2008 - 10:28 pm. (1 message)
To: David Miller <davem@...>
Cc: <netdev@...>, LKML <linux-kernel@...>
Date: Thursday, September 18, 2008 - 9:52 pm

This is all the net driver-related regressions AFAICS.

Please pull from 'davem-fixes' branch of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git davem-fixes

to receive the following updates:

drivers/net/e100.c | 4 +---
drivers/net/e1000/e1000_hw.c | 23 +++++++++++++++++++++++
drivers/net/forcedeth.c | 16 +++++++++++++---
3 files changed, 37 insertions(+), 6 deletions(-)

Christopher Li (1):
e1000: prevent corruption of EEPROM/NVM

Rafael J. Wysocki (1):
e100: Use pci_pme_active to clear PME_Status and disable PME#

Yinghai Lu (1):
forcedeth: call restore mac addr in nv_shutdown path

diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 453115a..5cf78d6 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -2738,9 +2738,7 @@ static int __devinit e100_probe(struct pci_dev *pdev,
nic->flags |= wol_magic;

/* ack any pending wake events, disable PME */
- err = pci_enable_wake(pdev, 0, 0);
- if (err)
- DPRINTK(PROBE, ERR, "Error clearing wake event\n");
+ pci_pme_active(pdev, false);

strcpy(netdev->name, "eth%d");
if((err = register_netdev(netdev))) {
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
index 9d6edf3..d04eef5 100644
--- a/drivers/net/e1000/e1000_hw.c
+++ b/drivers/net/e1000/e1000_hw.c
@@ -144,6 +144,8 @@ static s32 e1000_host_if_read_cookie(struct e1000_hw *hw, u8 *buffer);
static u8 e1000_calculate_mng_checksum(char *buffer, u32 length);
static s32 e1000_configure_kmrn_for_10_100(struct e1000_hw *hw, u16 duplex);
static s32 e1000_configure_kmrn_for_1000(struct e1000_hw *hw);
+static s32 e1000_do_read_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
+static s32 e1000_do_write_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);

/* IGP cable length table */
static const
@@ -168,6 +170,8 @@ u16 e1000_igp_2_cable_length_table[IGP02E1000_AGC_LENGTH_TABLE_SIZE] =
83, 89, 95, 100, 105, 109, 113, 116, 119,...

To: <jeff@...>
Cc: <netdev@...>, <linux-kernel@...>
Date: Thursday, September 18, 2008 - 10:17 pm

From: Jeff Garzik <jeff@garzik.org>

Pulled, thanks a lot Jeff.
--

Previous thread: [PATCH] netdev: simple_tx_hash shouldn't hash inside fragments by Alexander Duyck on Thursday, September 18, 2008 - 8:43 pm. (2 messages)

Next thread: [GIT]: Networking by David Miller on Thursday, September 18, 2008 - 10:28 pm. (1 message)