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>

diff --git a/drivers/staging/ozwpan/ozpd.c b/drivers/staging/ozwpan/ozpd.c
index 8e1929aba933332b33a0c663d0bd31ccd025dd5f..f8b9da080c4b65c5b079fcfe8d9eea9bdd5f41a6 100644 (file)
--- 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. */