lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:
	drivers/net/pcmcia/smc91c92_cs.c
	drivers/net/virtio_net.c
This commit is contained in:
David S. Miller
2010-04-14 05:01:33 -07:00
parent 1253332f75 0110d6f22f
commit dad1e54b12
8 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/forcedeth.c
View File

@ -5901,7 +5901,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
/* Limit the number of tx's outstanding for hw bug */
if (id->driver_data & DEV_NEED_TX_LIMIT) {
np->tx_limit = 1;
if ((id->driver_data & DEV_NEED_TX_LIMIT2) &&
if (((id->driver_data & DEV_NEED_TX_LIMIT2) == DEV_NEED_TX_LIMIT2) &&
pci_dev->revision >= 0xA2)
np->tx_limit = 0;
}