diff options
-rw-r--r-- | include/linux/skbuff.h | 17 | ||||
-rw-r--r-- | net/core/skbuff.c | 18 |
2 files changed, 19 insertions, 16 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 6d6cde7b243c..01a11b0c0291 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
@@ -1272,22 +1272,7 @@ static inline struct sk_buff *__dev_alloc_skb(unsigned int length, | |||
1272 | return skb; | 1272 | return skb; |
1273 | } | 1273 | } |
1274 | 1274 | ||
1275 | /** | 1275 | extern struct sk_buff *dev_alloc_skb(unsigned int length); |
1276 | * dev_alloc_skb - allocate an skbuff for receiving | ||
1277 | * @length: length to allocate | ||
1278 | * | ||
1279 | * Allocate a new &sk_buff and assign it a usage count of one. The | ||
1280 | * buffer has unspecified headroom built in. Users should allocate | ||
1281 | * the headroom they think they need without accounting for the | ||
1282 | * built in space. The built in space is used for optimisations. | ||
1283 | * | ||
1284 | * %NULL is returned if there is no free memory. Although this function | ||
1285 | * allocates memory it can be called from an interrupt. | ||
1286 | */ | ||
1287 | static inline struct sk_buff *dev_alloc_skb(unsigned int length) | ||
1288 | { | ||
1289 | return __dev_alloc_skb(length, GFP_ATOMIC); | ||
1290 | } | ||
1291 | 1276 | ||
1292 | extern struct sk_buff *__netdev_alloc_skb(struct net_device *dev, | 1277 | extern struct sk_buff *__netdev_alloc_skb(struct net_device *dev, |
1293 | unsigned int length, gfp_t gfp_mask); | 1278 | unsigned int length, gfp_t gfp_mask); |
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index cf489b6329e8..0daf5c0e5b8d 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
@@ -263,6 +263,24 @@ struct sk_buff *__netdev_alloc_skb(struct net_device *dev, | |||
263 | return skb; | 263 | return skb; |
264 | } | 264 | } |
265 | 265 | ||
266 | /** | ||
267 | * dev_alloc_skb - allocate an skbuff for receiving | ||
268 | * @length: length to allocate | ||
269 | * | ||
270 | * Allocate a new &sk_buff and assign it a usage count of one. The | ||
271 | * buffer has unspecified headroom built in. Users should allocate | ||
272 | * the headroom they think they need without accounting for the | ||
273 | * built in space. The built in space is used for optimisations. | ||
274 | * | ||
275 | * %NULL is returned if there is no free memory. Although this function | ||
276 | * allocates memory it can be called from an interrupt. | ||
277 | */ | ||
278 | struct sk_buff *dev_alloc_skb(unsigned int length) | ||
279 | { | ||
280 | return __dev_alloc_skb(length, GFP_ATOMIC); | ||
281 | } | ||
282 | EXPORT_SYMBOL(dev_alloc_skb); | ||
283 | |||
266 | static void skb_drop_list(struct sk_buff **listp) | 284 | static void skb_drop_list(struct sk_buff **listp) |
267 | { | 285 | { |
268 | struct sk_buff *list = *listp; | 286 | struct sk_buff *list = *listp; |