From a89ac9d21e66f764ffebfc9505605b49c9a4a43b Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Wed, 2 Nov 2011 13:40:28 +0000
Subject: [PATCH] --- yaml --- r: 273521 b: refs/heads/master c:
 bc417e30f8dff6e8657005c4317cd71239e53375 h: refs/heads/master i:   273519:
 b132a319d2a39a62a33fe1e84fb71815973cf44f v: v3

---
 [refs]                  | 2 +-
 trunk/net/core/skbuff.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ea419270ed15..4e78ac895cf9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 918eb39962dfff9490a43cd08176b962cacc7978
+refs/heads/master: bc417e30f8dff6e8657005c4317cd71239e53375
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
index ca4db40e75b8..18a3cebb753d 100644
--- a/trunk/net/core/skbuff.c
+++ b/trunk/net/core/skbuff.c
@@ -189,6 +189,7 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask,
 	 * aligned memory blocks, unless SLUB/SLAB debug is enabled.
 	 * Both skb->head and skb_shared_info are cache line aligned.
 	 */
+	size = SKB_DATA_ALIGN(size);
 	size += SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
 	data = kmalloc_node_track_caller(size, gfp_mask, node);
 	if (!data)