aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-02-04 19:52:41 -0500
committerDavid S. Miller <davem@davemloft.net>2009-02-04 19:52:41 -0500
commit7870389478d3c682c79c07abe7f1fce8b8a81952 (patch)
tree8dc50c5aa48c65c7eb5cc2770501a45f1e2371f6 /drivers/net
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')
-rw-r--r--drivers/net/cxgb3/sge.c3
-rw-r--r--drivers/net/gianfar.c3
-rw-r--r--drivers/net/gianfar.h2
3 files changed, 5 insertions, 3 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:
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) {
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index dadd08cd801..802a9516ce4 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -372,6 +372,9 @@ static int gfar_probe(struct of_device *ofdev,
372 /* Reset MAC layer */ 372 /* Reset MAC layer */
373 gfar_write(&priv->regs->maccfg1, MACCFG1_SOFT_RESET); 373 gfar_write(&priv->regs->maccfg1, MACCFG1_SOFT_RESET);
374 374
375 /* We need to delay at least 3 TX clocks */
376 udelay(2);
377
375 tempval = (MACCFG1_TX_FLOW | MACCFG1_RX_FLOW); 378 tempval = (MACCFG1_TX_FLOW | MACCFG1_RX_FLOW);
376 gfar_write(&priv->regs->maccfg1, tempval); 379 gfar_write(&priv->regs->maccfg1, tempval);
377 380
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h
index 811855bc423..54332b0059d 100644
--- a/drivers/net/gianfar.h
+++ b/drivers/net/gianfar.h
@@ -314,7 +314,7 @@ extern const char gfar_driver_version[];
314#define ATTRELI_EI(x) (x) 314#define ATTRELI_EI(x) (x)
315 315
316#define BD_LFLAG(flags) ((flags) << 16) 316#define BD_LFLAG(flags) ((flags) << 16)
317#define BD_LENGTH_MASK 0x00ff 317#define BD_LENGTH_MASK 0x0000ffff
318 318
319/* TxBD status field bits */ 319/* TxBD status field bits */
320#define TXBD_READY 0x8000 320#define TXBD_READY 0x8000