Revert "ozwpan: replace kfree_skb with dev_kfree_skb in ozpd.c"
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 4 Jun 2013 23:02:03 +0000 (16:02 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 4 Jun 2013 23:02:03 +0000 (16:02 -0700)
This reverts commit 91c6c4bdb241cd27082cfa130675a2cd52cda5a4.

It wasn't supposed to be applied, my fault.

Cc: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/ozwpan/ozpd.c

index 26db8e3..8e1929a 100644 (file)
@@ -207,7 +207,7 @@ void oz_pd_destroy(struct oz_pd *pd)
                f = container_of(e, struct oz_tx_frame, link);
                e = e->next;
                if (f->skb != NULL)
-                       dev_kfree_skb(f->skb);
+                       kfree_skb(f->skb);
                oz_retire_frame(pd, f);
        }
        oz_elt_buf_term(&pd->elt_buff);
@@ -491,7 +491,7 @@ static struct sk_buff *oz_build_frame(struct oz_pd *pd, struct oz_tx_frame *f)
        }
        return skb;
 fail:
-       dev_kfree_skb(skb);
+       kfree_skb(skb);
        return NULL;
 }
 /*------------------------------------------------------------------------------
@@ -553,7 +553,7 @@ static int oz_send_next_queued_frame(struct oz_pd *pd, int more_data)
                                                pd->nb_queued_isoc_frames);
                        return 0;
                } else {
-                       dev_kfree_skb(skb);
+                       kfree_skb(skb);
                        oz_trace2(OZ_TRACE_TX_FRAMES, "Dropping ISOC Frame>\n");
                        oz_event_log(OZ_EVT_TX_ISOC_DROP, 0, 0, NULL, 0);
                        return -1;
@@ -645,7 +645,7 @@ static int oz_send_isoc_frame(struct oz_pd *pd)
        skb->protocol = htons(OZ_ETHERTYPE);
        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 -1;
        }
        oz_hdr = (struct oz_hdr *)skb_put(skb, total_size);
@@ -744,7 +744,7 @@ int oz_isoc_stream_create(struct oz_pd *pd, u8 ep_num)
  */
 static void oz_isoc_stream_free(struct oz_isoc_stream *st)
 {
-       dev_kfree_skb(st->skb);
+       kfree_skb(st->skb);
        kfree(st);
 }
 /*------------------------------------------------------------------------------
@@ -880,7 +880,7 @@ int oz_send_isoc_unit(struct oz_pd *pd, u8 ep_num, const u8 *data, int len)
                }
 
 out:   oz_event_log(OZ_EVT_TX_ISOC_DROP, 0, 0, NULL, 0);
-       dev_kfree_skb(skb);
+       kfree_skb(skb);
        return -1;
 
        }