From ac02ffe2e2dd9f698d384cbf3500683e274e981c Mon Sep 17 00:00:00 2001 From: Jiri Benc Date: Thu, 2 Jun 2005 16:48:05 -0700 Subject: [PATCH] --- yaml --- r: 1806 b: refs/heads/master c: 5ba0eac6e0b7e2889649a1105d97c600595e2bb1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/netdevice.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4da108000f38..0489b78e7350 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b597ef4712c05c962640a655386a7f06cc1a1fbc +refs/heads/master: 5ba0eac6e0b7e2889649a1105d97c600595e2bb1 diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index 470af8c1a4a0..ba5d1236aa17 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/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)];