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

Commit 00898a47 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

rt2x00: fix usage of NULL queue 



We may call rt2x00queue_pause_queue(queue) with queue == NULL. Bug
was introduced by commit 62fe7784
"rt2x00: Fix stuck queue in tx failure case" .

Cc: stable@kernel.org # 3.0+
Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 449f94ea

drivers/net/wireless/rt2x00/rt2x00mac.c

+3 −2
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ void rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb) 
	 * due to possible race conditions in mac80211.

	 */

	if (!test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags))

		goto exit_fail;

		goto exit_free_skb;



	/*

	 * Use the ATIM queue if appropriate and present.
@@ -127,7 +127,7 @@ void rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb) 
		ERROR(rt2x00dev,

		      "Attempt to send packet over invalid queue %d.\n"

		      "Please file bug report to %s.\n", qid, DRV_PROJECT);

		goto exit_fail;

		goto exit_free_skb;

	}



	/*
@@ -159,6 +159,7 @@ void rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb) 


 exit_fail:

	rt2x00queue_pause_queue(queue);

 exit_free_skb:

	dev_kfree_skb_any(skb);

}

EXPORT_SYMBOL_GPL(rt2x00mac_tx);