aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/gianfar.h
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/gianfar.h
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/gianfar.h')
-rw-r--r--drivers/net/gianfar.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h
index 811855bc4231..54332b0059df 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