summaryrefslogtreecommitdiffstats
path: root/drivers/staging/ozwpan
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-04 16:02:46 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-04 16:02:46 -0700
commit6b790d0fae3a6e80af6b0e71cbb39a38b822230a (patch)
treed5d474d51098f2904685718146ec1b649eed0507 /drivers/staging/ozwpan
parentdd3cef0f0715b79d29a4b0482117175f44b7d83c (diff)
downloadlinux-6b790d0fae3a6e80af6b0e71cbb39a38b822230a.tar.bz2
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 <burzalodowa@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/ozwpan')
-rw-r--r--drivers/staging/ozwpan/ozproto.c2
1 files changed, 1 insertions, 1 deletions
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));