diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-07 02:42:07 +0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-07 02:42:07 +0400 |
| commit | 26abd53d8e9e51bbeea0b4772e8dffece3eeff38 (patch) | |
| tree | d9dc6f45c9142e6a8f58f1aa8fc75e66f9edd0e9 /include/linux/netdevice.h | |
| parent | ff89bf3bc0534aa03b5375aa906544d96911bad4 (diff) | |
| parent | 8f5bb0438b86d1a5393176ceeec2836fd469edf8 (diff) | |
| download | linux-26abd53d8e9e51bbeea0b4772e8dffece3eeff38.tar.xz | |
auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 470af8c1a4a0..ba5d1236aa17 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -204,7 +204,7 @@ struct hh_cache /* cached hardware header; allow for machine alignment needs. */ #define HH_DATA_MOD 16 #define HH_DATA_OFF(__len) \ - (HH_DATA_MOD - ((__len) & (HH_DATA_MOD - 1))) + (HH_DATA_MOD - (((__len - 1) & (HH_DATA_MOD - 1)) + 1)) #define HH_DATA_ALIGN(__len) \ (((__len)+(HH_DATA_MOD-1))&~(HH_DATA_MOD - 1)) unsigned long hh_data[HH_DATA_ALIGN(LL_MAX_HEADER) / sizeof(long)]; |