diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-07-12 05:08:34 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-12 05:08:34 +0200 |
| commit | 4915a0de43c3e9aef92005c1f94a8ff3a6cfced5 (patch) | |
| tree | 8c387b4248593430418083c9ea4f2f7416abdd54 | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher... (diff) | |
| download | linux-4915a0de43c3e9aef92005c1f94a8ff3a6cfced5.tar.xz linux-4915a0de43c3e9aef92005c1f94a8ff3a6cfced5.zip | |
net: introduce __netdev_alloc_skb_ip_align
RX rings should use GFP_KERNEL allocations if possible, add
__netdev_alloc_skb_ip_align() helper to ease this.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/linux/skbuff.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 32ada5351ab4..a24218c9c84b 100644 --- a/include/linux/skbuff.h +++ b/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 |