From: Greg Kroah-Hartman Date: Tue, 4 Jun 2013 23:02:46 +0000 (-0700) Subject: Revert "ozwpan: replace alloc_skb with dev_alloc_skb in ozproto.c" X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=6b790d0fae3a6e80af6b0e71cbb39a38b822230a;p=deliverable%2Flinux.git Revert "ozwpan: replace alloc_skb with dev_alloc_skb in ozproto.c" This reverts commit c3147965384f1a5ace685dc34e78f9bb201f357d. I shouldn't have applied it, my fault. Cc: Xenia Ragiadakou Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/ozwpan/ozproto.c b/drivers/staging/ozwpan/ozproto.c index 83bbd4b449fe..3badf1537adb 100644 --- a/drivers/staging/ozwpan/ozproto.c +++ b/drivers/staging/ozwpan/ozproto.c @@ -97,7 +97,7 @@ static void oz_send_conn_rsp(struct oz_pd *pd, u8 status) struct oz_elt_connect_rsp *body; int sz = sizeof(struct oz_hdr) + sizeof(struct oz_elt) + sizeof(struct oz_elt_connect_rsp); - skb = dev_alloc_skb(sz + OZ_ALLOCATED_SPACE(dev)); + skb = alloc_skb(sz + OZ_ALLOCATED_SPACE(dev), GFP_ATOMIC); if (skb == NULL) return; skb_reserve(skb, LL_RESERVED_SPACE(dev));