diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-20 17:30:41 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-20 17:30:41 -0400 |
| commit | d1a667892658259aab52d9968571abd9efbc59a1 (patch) | |
| tree | 470101ab379d375bfd635ecec27ecd59441ac460 | |
| parent | d269a69fbbbb7ddd2081af7a768feac754b8357a (diff) | |
| parent | 1cb5821f444cadbe94453282f9f4767cf8744a8e (diff) | |
| download | linux-stable-d1a667892658259aab52d9968571abd9efbc59a1.tar.gz | |
Merge branch 'e1000-7.0.38-k2-fixes' of git://63.64.152.142/~ahkok/git/netdev-2.6
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 82d443ba3612..fb8cef619142 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c @@ -3585,8 +3585,7 @@ e1000_clean_rx_irq(struct e1000_adapter *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 @@ -4174,7 +4173,7 @@ e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) spin_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) |