diff options
| author | David S. Miller | 2009-02-05 01:52:41 +0100 |
|---|---|---|
| committer | David S. Miller | 2009-02-05 01:52:41 +0100 |
| commit | 7870389478d3c682c79c07abe7f1fce8b8a81952 (patch) | |
| tree | 8dc50c5aa48c65c7eb5cc2770501a45f1e2371f6 /drivers/net/cxgb3 | |
| parent | Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ (diff) | |
| parent | gianfar: Fix potential soft reset race (diff) | |
| download | kernel-qcow2-linux-7870389478d3c682c79c07abe7f1fce8b8a81952.tar.gz kernel-qcow2-linux-7870389478d3c682c79c07abe7f1fce8b8a81952.tar.xz kernel-qcow2-linux-7870389478d3c682c79c07abe7f1fce8b8a81952.zip | |
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.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c index 272a0168f3e9..8205aa4ae945 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) { |