---

yaml --- r: 72097 b: refs/heads/master c: deea84b h: refs/heads/master i: 72095: b7aff1d v: v3
git-mirror · Oct 22, 2007 · dd0965a · dd0965a
1 parent 147132c
commit dd0965a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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))