e1000: fix two mispatches
Subsystems (2)
cover e1000: fix two mispatches
Hi,
This patch series implements two e100 fixes for an old and new patch mishap.
[1] fix mispatch for media type detect.
[2] fix mismerge skb_put.
These changes are available through git.
git://63.64.152.142/~ahkok/git/netdev-2.6 e1000-7.0.38-k2-fixes
these patches are against
netdev-2.6#upstream 8fc65162a8f25929be80c8d6321a3479e92b5aae
Cheers,
Auke
--- drivers/net/e1000/e1000_main.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
--
Auke Kok <[email protected]>
Intel Pro Ethernet Driver Group
LAN Access Division / Digital Enterprise Group
PATCH 1/2 e1000: fix mispatch for media type detect.
Recent patch was mismerged in the miitool path. e1000_media_type_copper was being compared with the phy type instead of the media type.
---
drivers/net/e1000/e1000_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/e1000/e1000_main.c +1 -1
@@ -4174,7 +4174,7 @@ e1000_mii_ioctl(struct net_device *netdespin_unlock_irqrestore (&adapter->stats_lock, flags);return -EIO ; } -if (adapter->hw.phy_type == e1000_media_type_copper) { +if (adapter->hw.media_type == e1000_media_type_copper) {switch (data->reg_num) {case PHY_CTRL :if (mii_reg &MII_CR_POWER_DOWN )
--
Auke Kok <[email protected]>
Intel Pro Ethernet Driver Group
LAN Access Division / Digital Enterprise Group
PATCH 2/2 e1000: fix mismerge skb_put.
In reply to Kok, AukeSeems there was a bit of a fix needed to due a bad merge in the legacy receive path. Fixes a panic due to skb_over_panic.
---
drivers/net/e1000/e1000_main.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
drivers/net/e1000/e1000_main.c +1 -2
@@ -3585,8 +3585,7 @@ e1000_clean_rx_irq(struct e1000_adapter buffer_info->skb = skb; goto next_desc; } - }else -skb_put (skb, length); + }/* code added for copybreak, this should improve * performance for small packets with large amounts
--
Auke Kok <[email protected]>
Intel Pro Ethernet Driver Group
LAN Access Division / Digital Enterprise Group
Jeff Garzik
AppliedQuoted 11 lines · Auke
Hi,
This patch series implements two e100 fixes for an old and new patch mishap.
[1] fix mispatch for media type detect.
[2] fix mismergeskb_put.These changes are available through git.
git://63.64.152.142/~ahkok/git/netdev-2.6e1000-7.0.38-k2-fixes
applied