Skip to content

L
linux-davinci
Commit d1a66789 authored by Jeff Garzik's avatar Jeff Garzik
Browse files
Options

Merge branch 'e1000-7.0.38-k2-fixes' of git://63.64.152.142/~ahkok/git/netdev-2.6

parents d269a69f 1cb5821f
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
drivers/net/e1000/e1000_main.c
View file @ d1a66789
...@@ -3585,8 +3585,7 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter, ...@@ -3585,8 +3585,7 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter,
buffer_info->skb = skb; buffer_info->skb = skb;
goto next_desc; goto next_desc;
} }
} else }
skb_put(skb, length);
/* code added for copybreak, this should improve /* code added for copybreak, this should improve
* performance for small packets with large amounts * performance for small packets with large amounts
...@@ -4174,7 +4173,7 @@ e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) ...@@ -4174,7 +4173,7 @@ e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
spin_unlock_irqrestore(&adapter->stats_lock, flags); spin_unlock_irqrestore(&adapter->stats_lock, flags);
return -EIO; return -EIO;
} }
if (adapter->hw.phy_type == e1000_media_type_copper) { if (adapter->hw.media_type == e1000_media_type_copper) {
switch (data->reg_num) { switch (data->reg_num) {
case PHY_CTRL: case PHY_CTRL:
if (mii_reg & MII_CR_POWER_DOWN) if (mii_reg & MII_CR_POWER_DOWN)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment