summaryrefslogtreecommitdiffstats
path: root/drivers/net/cxgb3
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-02-04 16:52:41 -0800
committerDavid S. Miller <davem@davemloft.net>2009-02-04 16:52:41 -0800
commit7870389478d3c682c79c07abe7f1fce8b8a81952 (patch)
tree8dc50c5aa48c65c7eb5cc2770501a45f1e2371f6 /drivers/net/cxgb3
parent005c79b3d4df48fa01b77e5ccf46e5cd4754cfd5 (diff)
parentb98ac702f49042ab0c382b839465b95a2bd0cd65 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/cxgb3')
-rw-r--r--drivers/net/cxgb3/sge.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
index 272a0168f3e..8205aa4ae94 100644
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -2201,8 +2201,7 @@ no_mem:
} else if ((len = ntohl(r->len_cq)) != 0) {
struct sge_fl *fl;
- if (eth)
- lro = qs->lro_enabled && is_eth_tcp(rss_hi);
+ lro &= eth && is_eth_tcp(rss_hi);
fl = (len & F_RSPD_FLQ) ? &qs->fl[1] : &qs->fl[0];
if (fl->use_pages) {