From: Xenia Ragiadakou Date: Tue, 21 May 2013 10:18:58 +0000 (+0300) Subject: ozwpan: replace kfree_skb with dev_kfree_skb in ozpd.c X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e241a8b61671b487e1a04b455dbd32ab965250ef;p=linux-beck.git ozwpan: replace kfree_skb with dev_kfree_skb in ozpd.c This patch replaces the calls to kfree_skb with calls to dev_kfree_skb. Signed-off-by: Xenia Ragiadakou Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/ozwpan/ozpd.c b/drivers/staging/ozwpan/ozpd.c index 8e1929aba933..26db8e36b281 100644 --- a/drivers/staging/ozwpan/ozpd.c +++ b/drivers/staging/ozwpan/ozpd.c @@ -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) - kfree_skb(f->skb); + dev_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: - kfree_skb(skb); + dev_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 { - kfree_skb(skb); + dev_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) { - kfree_skb(skb); + dev_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) { - kfree_skb(st->skb); + dev_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); - kfree_skb(skb); + dev_kfree_skb(skb); return -1; }