From 5f8efdc5f1b2c2986572e1cc03d63db3d770375b Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Fri, 9 Nov 2007 14:49:34 -0800 Subject: [PATCH] Revert "[NET]: Fix SKB_WITH_OVERHEAD calculation" This reverts commit deea84b0ae3d26b41502ae0a39fe7fe134e703d0. The commit reduces tbench performance by 50% for SLUB. --- include/linux/skbuff.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 94e4991..78ccdcc 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -41,7 +41,8 @@ #define SKB_DATA_ALIGN(X) (((X) + (SMP_CACHE_BYTES - 1)) & \ ~(SMP_CACHE_BYTES - 1)) #define SKB_WITH_OVERHEAD(X) \ - ((X) - SKB_DATA_ALIGN(sizeof(struct skb_shared_info))) + (((X) - sizeof(struct skb_shared_info)) & \ + ~(SMP_CACHE_BYTES - 1)) #define SKB_MAX_ORDER(X, ORDER) \ SKB_WITH_OVERHEAD((PAGE_SIZE << (ORDER)) - (X)) #define SKB_MAX_HEAD(X) (SKB_MAX_ORDER((X), 0)) -- 1.5.3.4