diff options
Diffstat (limited to 'net/core/skbuff.c')
| -rw-r--r-- | net/core/skbuff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index bac3c5756d63..d124306b81fd 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
| @@ -353,7 +353,7 @@ struct sk_buff *__netdev_alloc_skb(struct net_device *dev, | |||
| 353 | unsigned int fragsz = SKB_DATA_ALIGN(length + NET_SKB_PAD) + | 353 | unsigned int fragsz = SKB_DATA_ALIGN(length + NET_SKB_PAD) + |
| 354 | SKB_DATA_ALIGN(sizeof(struct skb_shared_info)); | 354 | SKB_DATA_ALIGN(sizeof(struct skb_shared_info)); |
| 355 | 355 | ||
| 356 | if (fragsz <= PAGE_SIZE && !(gfp_mask & __GFP_WAIT)) { | 356 | if (fragsz <= PAGE_SIZE && !(gfp_mask & (__GFP_WAIT | GFP_DMA))) { |
| 357 | void *data = netdev_alloc_frag(fragsz); | 357 | void *data = netdev_alloc_frag(fragsz); |
| 358 | 358 | ||
| 359 | if (likely(data)) { | 359 | if (likely(data)) { |
| @@ -3362,7 +3362,7 @@ EXPORT_SYMBOL(kfree_skb_partial); | |||
| 3362 | * @to: prior buffer | 3362 | * @to: prior buffer |
| 3363 | * @from: buffer to add | 3363 | * @from: buffer to add |
| 3364 | * @fragstolen: pointer to boolean | 3364 | * @fragstolen: pointer to boolean |
| 3365 | * | 3365 | * @delta_truesize: how much more was allocated than was requested |
| 3366 | */ | 3366 | */ |
| 3367 | bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from, | 3367 | bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from, |
| 3368 | bool *fragstolen, int *delta_truesize) | 3368 | bool *fragstolen, int *delta_truesize) |
