Skip to content

Commit

Permalink
Revert "ozwpan: replace alloc_skb with dev_alloc_skb in ozpd.c"
Browse files Browse the repository at this point in the history
This reverts commit 812eb99.

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

Cc: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Greg Kroah-Hartman committed Jun 4, 2013
1 parent 6b790d0 commit ec0ee95
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions drivers/staging/ozwpan/ozpd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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. */
Expand Down

0 comments on commit ec0ee95

Please sign in to comment.