Skip to content

L
linux-davinci
Commit 78703894 authored by David S. Miller's avatar David S. Miller
Browse files
Options

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

parents 005c79b3 b98ac702
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
drivers/net/cxgb3/sge.c
View file @ 78703894
...@@ -2201,8 +2201,7 @@ no_mem: ...@@ -2201,8 +2201,7 @@ no_mem:
} else if ((len = ntohl(r->len_cq)) != 0) { } else if ((len = ntohl(r->len_cq)) != 0) {
struct sge_fl *fl; struct sge_fl *fl;
if (eth) lro &= eth && is_eth_tcp(rss_hi);
lro = qs->lro_enabled && is_eth_tcp(rss_hi);
fl = (len & F_RSPD_FLQ) ? &qs->fl[1] : &qs->fl[0]; fl = (len & F_RSPD_FLQ) ? &qs->fl[1] : &qs->fl[0];
if (fl->use_pages) { if (fl->use_pages) {
......
drivers/net/gianfar.c
View file @ 78703894
...@@ -372,6 +372,9 @@ static int gfar_probe(struct of_device *ofdev, ...@@ -372,6 +372,9 @@ static int gfar_probe(struct of_device *ofdev,
/* Reset MAC layer */ /* Reset MAC layer */
gfar_write(&priv->regs->maccfg1, MACCFG1_SOFT_RESET); gfar_write(&priv->regs->maccfg1, MACCFG1_SOFT_RESET);
/* We need to delay at least 3 TX clocks */
udelay(2);
tempval = (MACCFG1_TX_FLOW | MACCFG1_RX_FLOW); tempval = (MACCFG1_TX_FLOW | MACCFG1_RX_FLOW);
gfar_write(&priv->regs->maccfg1, tempval); gfar_write(&priv->regs->maccfg1, tempval);
......
drivers/net/gianfar.h
View file @ 78703894
...@@ -314,7 +314,7 @@ extern const char gfar_driver_version[]; ...@@ -314,7 +314,7 @@ extern const char gfar_driver_version[];
#define ATTRELI_EI(x) (x) #define ATTRELI_EI(x) (x)
#define BD_LFLAG(flags) ((flags) << 16) #define BD_LFLAG(flags) ((flags) << 16)
#define BD_LENGTH_MASK 0x00ff #define BD_LENGTH_MASK 0x0000ffff
/* TxBD status field bits */ /* TxBD status field bits */
#define TXBD_READY 0x8000 #define TXBD_READY 0x8000
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment