summaryrefslogtreecommitdiff
path: root/drivers/net/forcedeth.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-04-14 05:01:33 -0700
committerDavid S. Miller <davem@davemloft.net>2010-04-14 05:01:33 -0700
commitdad1e54b121d93ed47690d77736af63d3f11d657 (patch)
tree36fdd29537e43bbb4f36252e010a591ae6fe20bc /drivers/net/forcedeth.c
parent1253332f75f3774cc84d0b7693152656848901f9 (diff)
parent0110d6f22f392f976e84ab49da1b42f85b64a3c5 (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.c2
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
/* 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;
}