diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-04 23:03:22 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-04 23:03:22 (GMT) |
| commit | ec0ee957f657b6200a2629d4c54df68d2c622e12 (patch) | |
| tree | d96a26c508379d3a9b9735c4d6555bef7504ffc0 | |
| parent | 6b790d0fae3a6e80af6b0e71cbb39a38b822230a (diff) | |
| download | linux-fsl-qoriq-ec0ee957f657b6200a2629d4c54df68d2c622e12.tar.xz | |
Revert "ozwpan: replace alloc_skb with dev_alloc_skb in ozpd.c"
This reverts commit 812eb995d4c0795ea1fb431146523cace2693f49.
I shouldn't have applied it, my fault...
Cc: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/ozwpan/ozpd.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/ozwpan/ozpd.c b/drivers/staging/ozwpan/ozpd.c index 8e1929a..f8b9da0 100644 --- a/drivers/staging/ozwpan/ozpd.c +++ b/drivers/staging/ozwpan/ozpd.c @@ -463,7 +463,7 @@ static struct sk_buff *oz_build_frame(struct oz_pd *pd, struct oz_tx_frame *f) /* Allocate skb with enough space for the lower layers as well * as the space we need. */ - skb = dev_alloc_skb(f->total_size + OZ_ALLOCATED_SPACE(dev)); + skb = alloc_skb(f->total_size + OZ_ALLOCATED_SPACE(dev), GFP_ATOMIC); if (skb == NULL) return NULL; /* Reserve the head room for lower layers. @@ -633,7 +633,7 @@ static int oz_send_isoc_frame(struct oz_pd *pd) pd->max_tx_size, &list); if (list.next == &list) return 0; - skb = dev_alloc_skb(total_size + OZ_ALLOCATED_SPACE(dev)); + skb = alloc_skb(total_size + OZ_ALLOCATED_SPACE(dev), GFP_ATOMIC); if (skb == NULL) { oz_trace("Cannot alloc skb\n"); oz_elt_info_free_chain(&pd->elt_buff, &list); @@ -797,7 +797,8 @@ int oz_send_isoc_unit(struct oz_pd *pd, u8 ep_num, const u8 *data, int len) return 0; if (!skb) { /* Allocate enough space for max size frame. */ - skb = dev_alloc_skb(pd->max_tx_size + OZ_ALLOCATED_SPACE(dev)); + skb = alloc_skb(pd->max_tx_size + OZ_ALLOCATED_SPACE(dev), + GFP_ATOMIC); if (skb == NULL) return 0; /* Reserve the head room for lower layers. */ |