From dd0965ad7e0687c8e1e30bf81348349664934d43 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Sun, 21 Oct 2007 16:27:46 -0700 Subject: [PATCH] --- yaml --- r: 72097 b: refs/heads/master c: deea84b0ae3d26b41502ae0a39fe7fe134e703d0 h: refs/heads/master i: 72095: b7aff1df9a777806d1006fe353ff1d63fc238740 v: v3 --- [refs] | 2 +- trunk/include/linux/skbuff.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 99e887d18fbf..9e9d231d2595 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bfb85c9f753a7172bd962e8717118191dfd612cc +refs/heads/master: deea84b0ae3d26b41502ae0a39fe7fe134e703d0 diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h index f93f22b3d2ff..369f60a4797d 100644 --- a/trunk/include/linux/skbuff.h +++ b/trunk/include/linux/skbuff.h @@ -41,8 +41,7 @@ #define SKB_DATA_ALIGN(X) (((X) + (SMP_CACHE_BYTES - 1)) & \ ~(SMP_CACHE_BYTES - 1)) #define SKB_WITH_OVERHEAD(X) \ - (((X) - sizeof(struct skb_shared_info)) & \ - ~(SMP_CACHE_BYTES - 1)) + ((X) - SKB_DATA_ALIGN(sizeof(struct skb_shared_info))) #define SKB_MAX_ORDER(X, ORDER) \ SKB_WITH_OVERHEAD((PAGE_SIZE << (ORDER)) - (X)) #define SKB_MAX_HEAD(X) (SKB_MAX_ORDER((X), 0))