]>
Commit | Line | Data |
---|---|---|
9880552d GKH |
1 | From 5c659322a904a7cc0265e7b183372b9bdebec6db Mon Sep 17 00:00:00 2001 |
2 | From: Ayaz Abdulla <aabdulla@nvidia.com> | |
3 | Date: Tue, 13 Apr 2010 18:49:51 -0700 | |
4 | Subject: forcedeth: fix tx limit2 flag check | |
5 | ||
6 | From: Ayaz Abdulla <aabdulla@nvidia.com> | |
7 | ||
8 | commit 5c659322a904a7cc0265e7b183372b9bdebec6db upstream. | |
9 | ||
10 | This is a fix for bug 572201 @ bugs.debian.org | |
11 | ||
12 | This patch fixes the TX_LIMIT feature flag. The previous logic check | |
13 | for TX_LIMIT2 also took into account a device that only had TX_LIMIT | |
14 | set. | |
15 | ||
16 | Reported-by: Stephen Mulcahu <stephen.mulcahy@deri.org> | |
17 | Reported-by: Ben Huchings <ben@decadent.org.uk> | |
18 | Signed-off-by: Ayaz Abdulla <aabdulla@nvidia.com> | |
19 | Signed-off-by: David S. Miller <davem@davemloft.net> | |
20 | Cc: Ben Hutchings <ben@decadent.org.uk> | |
21 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
22 | ||
23 | --- | |
24 | drivers/net/forcedeth.c | 2 +- | |
25 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
26 | ||
27 | --- a/drivers/net/forcedeth.c | |
28 | +++ b/drivers/net/forcedeth.c | |
29 | @@ -5900,7 +5900,7 @@ static int __devinit nv_probe(struct pci | |
30 | /* Limit the number of tx's outstanding for hw bug */ | |
31 | if (id->driver_data & DEV_NEED_TX_LIMIT) { | |
32 | np->tx_limit = 1; | |
33 | - if ((id->driver_data & DEV_NEED_TX_LIMIT2) && | |
34 | + if (((id->driver_data & DEV_NEED_TX_LIMIT2) == DEV_NEED_TX_LIMIT2) && | |
35 | pci_dev->revision >= 0xA2) | |
36 | np->tx_limit = 0; | |
37 | } |