From 996f5e8831f762564689f3ed1fb59cb64a7f5777 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Wed, 7 Oct 2009 17:11:23 +0000 Subject: [PATCH] --- yaml --- r: 170673 b: refs/heads/master c: 61321bbd6235ca9a40ba3bc249e8906cc66233c3 h: refs/heads/master i: 170671: 94729859d682aec3d89c0866ba65083634d527e2 v: v3 --- [refs] | 2 +- trunk/include/linux/skbuff.h | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index dfd557a8b83e..9ab941a40998 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f373b53b5fe67aa4a6f28f921a529cc90f88e79b +refs/heads/master: 61321bbd6235ca9a40ba3bc249e8906cc66233c3 diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h index 8c866b5cb97b..0c68fbd6faac 100644 --- a/trunk/include/linux/skbuff.h +++ b/trunk/include/linux/skbuff.h @@ -1491,6 +1491,16 @@ static inline struct sk_buff *netdev_alloc_skb(struct net_device *dev, return __netdev_alloc_skb(dev, length, GFP_ATOMIC); } +static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev, + unsigned int length) +{ + struct sk_buff *skb = netdev_alloc_skb(dev, length + NET_IP_ALIGN); + + if (NET_IP_ALIGN && skb) + skb_reserve(skb, NET_IP_ALIGN); + return skb; +} + extern struct page *__netdev_alloc_page(struct net_device *dev, gfp_t gfp_mask); /**