summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXenia Ragiadakou <burzalodowa@gmail.com>2013-05-21 13:18:56 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-21 10:54:45 -0700
commitb59983f525396a47cf8b28c13bbd5d5ff57859b8 (patch)
tree350435b4f915f55d2d63384cb6f18d66ba82fbef
parentcb41571aca0fa508d06742199d7567d6c1224b98 (diff)
downloadlinux-b59983f525396a47cf8b28c13bbd5d5ff57859b8.tar.bz2
ozwpan: replace alloc_skb with dev_alloc_skb in ozpd.c
This patch replaces the calls to alloc_skb with calls to dev_alloc_skb. dev_alloc_skb has GFP_ATOMIC priority so the replacement does not change the code semantics. Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/ozwpan/ozpd.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/ozwpan/ozpd.c b/drivers/staging/ozwpan/ozpd.c
index f8b9da080c4b..8e1929aba933 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 = alloc_skb(f->total_size + OZ_ALLOCATED_SPACE(dev), GFP_ATOMIC);
+ skb = dev_alloc_skb(f->total_size + OZ_ALLOCATED_SPACE(dev));
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 = alloc_skb(total_size + OZ_ALLOCATED_SPACE(dev), GFP_ATOMIC);
+ skb = dev_alloc_skb(total_size + OZ_ALLOCATED_SPACE(dev));
if (skb == NULL) {
oz_trace("Cannot alloc skb\n");
oz_elt_info_free_chain(&pd->elt_buff, &list);
@@ -797,8 +797,7 @@ 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 = alloc_skb(pd->max_tx_size + OZ_ALLOCATED_SPACE(dev),
- GFP_ATOMIC);
+ skb = dev_alloc_skb(pd->max_tx_size + OZ_ALLOCATED_SPACE(dev));
if (skb == NULL)
return 0;
/* Reserve the head room for lower layers. */