diff options
author | David S. Miller <davem@davemloft.net> | 2009-02-05 01:52:41 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-05 01:52:41 +0100 |
commit | 7870389478d3c682c79c07abe7f1fce8b8a81952 (patch) | |
tree | 8dc50c5aa48c65c7eb5cc2770501a45f1e2371f6 /drivers/net/gianfar.h | |
parent | Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ (diff) | |
parent | gianfar: Fix potential soft reset race (diff) | |
download | linux-7870389478d3c682c79c07abe7f1fce8b8a81952.tar.xz linux-7870389478d3c682c79c07abe7f1fce8b8a81952.zip |
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.h | 2 |
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[]; #define ATTRELI_EI(x) (x) #define BD_LFLAG(flags) ((flags) << 16) -#define BD_LENGTH_MASK 0x00ff +#define BD_LENGTH_MASK 0x0000ffff /* TxBD status field bits */ #define TXBD_READY 0x8000 |