diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-05 19:11:32 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-05 19:11:32 -0500 |
| commit | cc5724ce10c21cb44f9413266bb100ab89b18e2a (patch) | |
| tree | 513882a835d54c39a4bed8bc6e405ba55da20ada /drivers/net/gianfar.h | |
| parent | f01d1d546abb2f4028b5299092f529eefb01253a (diff) | |
| parent | a23f4bbd8d27ac8ddc5d71ace1f91bb503f0469a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
Revert "tcp: Always set urgent pointer if it's beyond snd_nxt"
ipv6: Copy cork options in ip6_append_data
udp: Fix UDP short packet false positive
gianfar: Fix potential soft reset race
gianfar: Fix BD_LENGTH_MASK definition
cxgb3: Fix lro switch
iwlwifi: save PCI state before suspend, restore after resume
iwlwifi: clean key table in iwl_clear_stations_table
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 b1a83344acc7..eaa86897f5c3 100644 --- a/drivers/net/gianfar.h +++ b/drivers/net/gianfar.h | |||
| @@ -312,7 +312,7 @@ extern const char gfar_driver_version[]; | |||
| 312 | #define ATTRELI_EI(x) (x) | 312 | #define ATTRELI_EI(x) (x) |
| 313 | 313 | ||
| 314 | #define BD_LFLAG(flags) ((flags) << 16) | 314 | #define BD_LFLAG(flags) ((flags) << 16) |
| 315 | #define BD_LENGTH_MASK 0x00ff | 315 | #define BD_LENGTH_MASK 0x0000ffff |
| 316 | 316 | ||
| 317 | /* TxBD status field bits */ | 317 | /* TxBD status field bits */ |
| 318 | #define TXBD_READY 0x8000 | 318 | #define TXBD_READY 0x8000 |