diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-19 10:27:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-19 10:27:45 -0400 |
| commit | 375db4810b27306ea400ab39d3d6f7a063ac9ff6 (patch) | |
| tree | f2cb778036dbfcade394c9e5ad94a69137fd352c /drivers/net/forcedeth.c | |
| parent | 73c6c7fbb74d07a80fee41ce4ca3976547519e42 (diff) | |
| parent | b91ecb0027c7171c83d7cf443a22c39b1fde6d83 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
gigaset: include cleanup cleanup
packet : remove init_net restriction
WAN: flush tx_queue in hdlc_ppp to prevent panic on rmmod hw_driver.
ip: Fix ip_dev_loopback_xmit()
net: dev_pick_tx() fix
fib: suppress lockdep-RCU false positive in FIB trie.
tun: orphan an skb on tx
forcedeth: fix tx limit2 flag check
iwlwifi: work around bogus active chains detection
Diffstat (limited to 'drivers/net/forcedeth.c')
| -rw-r--r-- | drivers/net/forcedeth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 73b260c3c654..5c98f7c22425 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
| @@ -5899,7 +5899,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i | |||
| 5899 | /* Limit the number of tx's outstanding for hw bug */ | 5899 | /* Limit the number of tx's outstanding for hw bug */ |
| 5900 | if (id->driver_data & DEV_NEED_TX_LIMIT) { | 5900 | if (id->driver_data & DEV_NEED_TX_LIMIT) { |
| 5901 | np->tx_limit = 1; | 5901 | np->tx_limit = 1; |
| 5902 | if ((id->driver_data & DEV_NEED_TX_LIMIT2) && | 5902 | if (((id->driver_data & DEV_NEED_TX_LIMIT2) == DEV_NEED_TX_LIMIT2) && |
| 5903 | pci_dev->revision >= 0xA2) | 5903 | pci_dev->revision >= 0xA2) |
| 5904 | np->tx_limit = 0; | 5904 | np->tx_limit = 0; |
| 5905 | } | 5905 | } |