---

yaml --- r: 273521 b: refs/heads/master c: bc417e3 h: refs/heads/master i: 273519: b132a31 v: v3
git-mirror · Nov 3, 2011 · a89ac9d · a89ac9d
1 parent 02ab7c7
commit a89ac9d
Show file tree

Hide file tree

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