Commit ec0ee957 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Revert "ozwpan: replace alloc_skb with dev_alloc_skb in ozpd.c"

This reverts commit 812eb995.

I shouldn't have applied it, my fault...

Cc: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6b790d0f
...@@ -463,7 +463,7 @@ static struct sk_buff *oz_build_frame(struct oz_pd *pd, struct oz_tx_frame *f) ...@@ -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 /* Allocate skb with enough space for the lower layers as well
* as the space we need. * 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) if (skb == NULL)
return NULL; return NULL;
/* Reserve the head room for lower layers. /* Reserve the head room for lower layers.
...@@ -633,7 +633,7 @@ static int oz_send_isoc_frame(struct oz_pd *pd) ...@@ -633,7 +633,7 @@ static int oz_send_isoc_frame(struct oz_pd *pd)
pd->max_tx_size, &list); pd->max_tx_size, &list);
if (list.next == &list) if (list.next == &list)
return 0; 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) { if (skb == NULL) {
oz_trace("Cannot alloc skb\n"); oz_trace("Cannot alloc skb\n");
oz_elt_info_free_chain(&pd->elt_buff, &list); 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) ...@@ -797,7 +797,8 @@ int oz_send_isoc_unit(struct oz_pd *pd, u8 ep_num, const u8 *data, int len)
return 0; return 0;
if (!skb) { if (!skb) {
/* Allocate enough space for max size frame. */ /* 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) if (skb == NULL)
return 0; return 0;
/* Reserve the head room for lower layers. */ /* Reserve the head room for lower layers. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment