asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Jeff Garzik 2006-04-20 17:30:41 -04:00
commit d1a6678926
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/net/e1000/e1000_main.c
View file

@ -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)