Commit 5d8cd3b1 authored by Zefir Kurtisi's avatar Zefir Kurtisi Committed by John W. Linville
Browse files

ath9k: fix DFS detector called in softirq context 



Signed-off-by: default avatarZefir Kurtisi <zefir.kurtisi@neratec.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8cab24f0

drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c

+2 −2
Original line number Diff line number Diff line
@@ -143,14 +143,14 @@ channel_detector_create(struct dfs_pattern_detector *dpd, u16 freq) 
	u32 sz, i;

	struct channel_detector *cd;



	cd = kmalloc(sizeof(*cd), GFP_KERNEL);

	cd = kmalloc(sizeof(*cd), GFP_ATOMIC);

	if (cd == NULL)

		goto fail;



	INIT_LIST_HEAD(&cd->head);

	cd->freq = freq;

	sz = sizeof(cd->detectors) * dpd->num_radar_types;

	cd->detectors = kzalloc(sz, GFP_KERNEL);

	cd->detectors = kzalloc(sz, GFP_ATOMIC);

	if (cd->detectors == NULL)

		goto fail;

drivers/net/wireless/ath/ath9k/dfs_pri_detector.c

+2 −2
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static bool pulse_queue_enqueue(struct pri_detector *pde, u64 ts) 
{

	struct pulse_elem *p = pool_get_pulse_elem();

	if (p == NULL) {

		p = kmalloc(sizeof(*p), GFP_KERNEL);

		p = kmalloc(sizeof(*p), GFP_ATOMIC);

		if (p == NULL) {

			DFS_POOL_STAT_INC(pulse_alloc_error);

			return false;
@@ -299,7 +299,7 @@ static bool pseq_handler_create_sequences(struct pri_detector *pde, 
		ps.deadline_ts = ps.first_ts + ps.dur;

		new_ps = pool_get_pseq_elem();

		if (new_ps == NULL) {

			new_ps = kmalloc(sizeof(*new_ps), GFP_KERNEL);

			new_ps = kmalloc(sizeof(*new_ps), GFP_ATOMIC);

			if (new_ps == NULL) {

				DFS_POOL_STAT_INC(pseq_alloc_error);

				return false;