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

Commit 329e5678 authored by Russ Gorby's avatar Russ Gorby Committed by Greg Kroah-Hartman
Browse files

n_gsm: replace kfree_skb w/ appropriate dev_* versions 



Drivers are supposed to use the dev_* versions of the kfree_skb
interfaces. In a couple of cases we were called with IRQs
disabled as well which kfree_skb() does not expect.

Replaced kfree_skb calls w/ dev_kfree_skb and dev_kfree_skb_any

Signed-off-by: default avatarRuss Gorby <russ.gorby@intel.com>
Tested-by: default avatarYin, Fengwei <fengwei.yin@intel.com>
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Cc: Grooming <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b4338e1e

drivers/tty/n_gsm.c

+4 −4
Original line number Diff line number Diff line
@@ -879,7 +879,7 @@ static int gsm_dlci_data_output_framed(struct gsm_mux *gsm, 
	if (len > gsm->mtu) {

		if (dlci->adaption == 3) {

			/* Over long frame, bin it */

			kfree_skb(dlci->skb);

			dev_kfree_skb_any(dlci->skb);

			dlci->skb = NULL;

			return 0;

		}
@@ -905,7 +905,7 @@ static int gsm_dlci_data_output_framed(struct gsm_mux *gsm, 
	skb_pull(dlci->skb, len);

	__gsm_data_queue(dlci, msg);

	if (last) {

		kfree_skb(dlci->skb);

		dev_kfree_skb_any(dlci->skb);

		dlci->skb = NULL;

	}

	return size;
@@ -1674,7 +1674,7 @@ static void gsm_dlci_free(struct kref *ref) 
	dlci->gsm->dlci[dlci->addr] = NULL;

	kfifo_free(dlci->fifo);

	while ((dlci->skb = skb_dequeue(&dlci->skb_list)))

		kfree_skb(dlci->skb);

		dev_kfree_skb(dlci->skb);

	kfree(dlci);

}
@@ -2013,7 +2013,7 @@ void gsm_cleanup_mux(struct gsm_mux *gsm) 
{

	int i;

	struct gsm_dlci *dlci = gsm->dlci[0];

	struct gsm_msg *txq, *utxq;

	struct gsm_msg *txq, *ntxq;

	struct gsm_control *gc;



	gsm->dead = 1;