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)