From 2ecb7d69cf39be7a184b7c5ac8aea0f05ab0193a Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Mon, 11 Jul 2011 20:08:34 -0700 Subject: [PATCH] --- yaml --- r: 256255 b: refs/heads/master c: 4915a0de43c3e9aef92005c1f94a8ff3a6cfced5 h: refs/heads/master i: 256253: 3c794d3dd90641fb10c7b43b73a1ffbfecfe9afe 256251: f0e095f6b27cb982ccf81fe0cc6554050045d81b 256247: c240629e8e46ff8b592a5d22850c71f8bb849f7e 256239: 5db29da76f1911d6f0a1f6d2cf981ef8d0f55a45 256223: 67041c9f0b8295effb3e998533e28f3fb26843cc 256191: c23d2f5d0640da6035d5b4264d9fc3634e038a7e 256127: 1707a0614a5d9fae2b09a765d0e33bbe7d3aee1f 255999: 8b6a99da2af5793bce7e358301aef57a9138a732 v: v3 --- [refs] | 2 +- trunk/include/linux/skbuff.h | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f4c491674916..3673a1609c4a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 039f02ebd9c2f3f3cb95c00b763fb70870c9116e +refs/heads/master: 4915a0de43c3e9aef92005c1f94a8ff3a6cfced5 diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h index 32ada5351ab4..a24218c9c84b 100644 --- a/trunk/include/linux/skbuff.h +++ b/trunk/include/linux/skbuff.h @@ -1579,16 +1579,22 @@ 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) +static inline struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev, + unsigned int length, gfp_t gfp) { - struct sk_buff *skb = netdev_alloc_skb(dev, length + NET_IP_ALIGN); + struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp); if (NET_IP_ALIGN && skb) skb_reserve(skb, NET_IP_ALIGN); return skb; } +static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev, + unsigned int length) +{ + return __netdev_alloc_skb_ip_align(dev, length, GFP_ATOMIC); +} + /** * __netdev_alloc_page - allocate a page for ps-rx on a specific device * @dev: network device to receive on