diff options
| author | Zefir Kurtisi | 2013-04-02 12:51:48 +0200 |
|---|---|---|
| committer | John W. Linville | 2013-04-08 20:35:03 +0200 |
| commit | 5d8cd3b16ec7b56d7502ff1ae21ae6596d2f96e9 (patch) | |
| tree | f69adccbd6b8ac1ca09897f7c343f421c9333edc /drivers/net/wireless/ath/ath9k/dfs_pri_detector.c | |
| parent | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber... (diff) | |
| download | kernel-qcow2-linux-5d8cd3b16ec7b56d7502ff1ae21ae6596d2f96e9.tar.gz kernel-qcow2-linux-5d8cd3b16ec7b56d7502ff1ae21ae6596d2f96e9.tar.xz kernel-qcow2-linux-5d8cd3b16ec7b56d7502ff1ae21ae6596d2f96e9.zip | |
ath9k: fix DFS detector called in softirq context
Signed-off-by: Zefir Kurtisi <zefir.kurtisi@neratec.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/dfs_pri_detector.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/dfs_pri_detector.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/dfs_pri_detector.c b/drivers/net/wireless/ath/ath9k/dfs_pri_detector.c index 91b8dceeadb1..5e48c5515b8c 100644 --- a/drivers/net/wireless/ath/ath9k/dfs_pri_detector.c +++ b/drivers/net/wireless/ath/ath9k/dfs_pri_detector.c @@ -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; |