diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-04 19:52:41 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-04 19:52:41 -0500 |
| commit | 7870389478d3c682c79c07abe7f1fce8b8a81952 (patch) | |
| tree | 8dc50c5aa48c65c7eb5cc2770501a45f1e2371f6 /drivers/net/cxgb3 | |
| parent | 005c79b3d4df48fa01b77e5ccf46e5cd4754cfd5 (diff) | |
| parent | b98ac702f49042ab0c382b839465b95a2bd0cd65 (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.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: | |||
| 2201 | } else if ((len = ntohl(r->len_cq)) != 0) { | 2201 | } else if ((len = ntohl(r->len_cq)) != 0) { |
| 2202 | struct sge_fl *fl; | 2202 | struct sge_fl *fl; |
| 2203 | 2203 | ||
| 2204 | if (eth) | 2204 | lro &= eth && is_eth_tcp(rss_hi); |
| 2205 | lro = qs->lro_enabled && is_eth_tcp(rss_hi); | ||
| 2206 | 2205 | ||
| 2207 | fl = (len & F_RSPD_FLQ) ? &qs->fl[1] : &qs->fl[0]; | 2206 | fl = (len & F_RSPD_FLQ) ? &qs->fl[1] : &qs->fl[0]; |
| 2208 | if (fl->use_pages) { | 2207 | if (fl->use_pages) { |