Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91c6c4bd authored by Xenia Ragiadakou's avatar Xenia Ragiadakou Committed by Greg Kroah-Hartman
Browse files

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: default avatarXenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c3147965

drivers/staging/ozwpan/ozpd.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -207,7 +207,7 @@ void oz_pd_destroy(struct oz_pd *pd) 
		f = container_of(e, struct oz_tx_frame, link);

		f = container_of(e, struct oz_tx_frame, link);

		e = e->next;

		e = e->next;

		if (f->skb != NULL)

		if (f->skb != NULL)

			kfree_skb(f->skb);

			dev_kfree_skb(f->skb);

		oz_retire_frame(pd, f);

		oz_retire_frame(pd, f);

	}

	}

	oz_elt_buf_term(&pd->elt_buff);

	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;

	return skb;

fail:

fail:

	kfree_skb(skb);

	dev_kfree_skb(skb);

	return NULL;

	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);

						pd->nb_queued_isoc_frames);

			return 0;

			return 0;

		} else {

		} else {

			kfree_skb(skb);

			dev_kfree_skb(skb);

			oz_trace2(OZ_TRACE_TX_FRAMES, "Dropping ISOC Frame>\n");

			oz_trace2(OZ_TRACE_TX_FRAMES, "Dropping ISOC Frame>\n");

			oz_event_log(OZ_EVT_TX_ISOC_DROP, 0, 0, NULL, 0);

			oz_event_log(OZ_EVT_TX_ISOC_DROP, 0, 0, NULL, 0);

			return -1;

			return -1;
@@ -645,7 +645,7 @@ static int oz_send_isoc_frame(struct oz_pd *pd) 
	skb->protocol = htons(OZ_ETHERTYPE);

	skb->protocol = htons(OZ_ETHERTYPE);

	if (dev_hard_header(skb, dev, OZ_ETHERTYPE, pd->mac_addr,

	if (dev_hard_header(skb, dev, OZ_ETHERTYPE, pd->mac_addr,

		dev->dev_addr, skb->len) < 0) {

		dev->dev_addr, skb->len) < 0) {

		kfree_skb(skb);

		dev_kfree_skb(skb);

		return -1;

		return -1;

	}

	}

	oz_hdr = (struct oz_hdr *)skb_put(skb, total_size);

	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)

static void oz_isoc_stream_free(struct oz_isoc_stream *st)

{

{

	kfree_skb(st->skb);

	dev_kfree_skb(st->skb);

	kfree(st);

	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);

out:	oz_event_log(OZ_EVT_TX_ISOC_DROP, 0, 0, NULL, 0);

	kfree_skb(skb);

	dev_kfree_skb(skb);

	return -1;

	return -1;





	}

	}