diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-14 08:01:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-14 08:01:33 -0400 |
| commit | dad1e54b121d93ed47690d77736af63d3f11d657 (patch) | |
| tree | 36fdd29537e43bbb4f36252e010a591ae6fe20bc /drivers/net/forcedeth.c | |
| parent | 1253332f75f3774cc84d0b7693152656848901f9 (diff) | |
| parent | 0110d6f22f392f976e84ab49da1b42f85b64a3c5 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/pcmcia/smc91c92_cs.c
drivers/net/virtio_net.c
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 3267b2390917..8aa80946d835 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
| @@ -5901,7 +5901,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i | |||
| 5901 | /* Limit the number of tx's outstanding for hw bug */ | 5901 | /* Limit the number of tx's outstanding for hw bug */ |
| 5902 | if (id->driver_data & DEV_NEED_TX_LIMIT) { | 5902 | if (id->driver_data & DEV_NEED_TX_LIMIT) { |
| 5903 | np->tx_limit = 1; | 5903 | np->tx_limit = 1; |
| 5904 | if ((id->driver_data & DEV_NEED_TX_LIMIT2) && | 5904 | if (((id->driver_data & DEV_NEED_TX_LIMIT2) == DEV_NEED_TX_LIMIT2) && |
| 5905 | pci_dev->revision >= 0xA2) | 5905 | pci_dev->revision >= 0xA2) |
| 5906 | np->tx_limit = 0; | 5906 | np->tx_limit = 0; |
| 5907 | } | 5907 | } |