diff options
| author | Xenia Ragiadakou <burzalodowa@gmail.com> | 2013-05-24 19:39:55 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-24 22:25:53 (GMT) |
| commit | 42b4212baa28ebb07147c1de3990c596e7612e97 (patch) | |
| tree | 3150a671986909c90bae6a8392d24831fe82fa61 /drivers/staging/ozwpan/ozproto.c | |
| parent | 972ff92fc564ab4db6b6678e8b9acd88f66ef75f (diff) | |
| download | linux-fsl-qoriq-42b4212baa28ebb07147c1de3990c596e7612e97.tar.xz | |
staging: ozwpan: Revert last changes
This patch reverts the changes made by the following patches:
commit id: edea341b0477ce5d53f7341f8b8cf8c91ad54ecf
[PATCH 1/4] ozwpan: replace alloc_skb with dev_alloc_skb in ozpd.c
commit id: b59983f525396a47cf8b28c13bbd5d5ff57859b8
[PATCH 2/4] ozwpan: replace alloc_skb with dev_alloc_skb in ozproto.c
commit id: 4422a6c14d0d0bfe519ec487693f1787f64b0b90
[PATCH 3/4] ozwpan: replace kfree_skb with dev_kfree_skb in ozpd.c
commit id: e241a8b61671b487e1a04b455dbd32ab965250ef
[PATCH 4/4] ozwpan: replace kfree_skb with dev_kfree_skb in ozproto.c
The reason of this revert is that dev_alloc_skb() is not defined
to be used in the allocation of socket buffers on the transmit path
but on the receive path.
Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/ozwpan/ozproto.c')
| -rw-r--r-- | drivers/staging/ozwpan/ozproto.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/ozwpan/ozproto.c b/drivers/staging/ozwpan/ozproto.c index 1a58458..3badf15 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)); @@ -110,7 +110,7 @@ static void oz_send_conn_rsp(struct oz_pd *pd, u8 status) /* Fill in device header */ if (dev_hard_header(skb, dev, OZ_ETHERTYPE, pd->mac_addr, dev->dev_addr, skb->len) < 0) { - dev_kfree_skb(skb); + kfree_skb(skb); return; } oz_hdr->control = (OZ_PROTOCOL_VERSION<<OZ_VERSION_SHIFT); |