evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ath9k: fix DFS detector called in softirq context

Browse source 
Signed-off-by: Zefir Kurtisi <zefir.kurtisi@neratec.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Zefir Kurtisi 2013-04-02 12:51:48 +02:00 • committed by John W. Linville
parent 8cab24f0b1
commit 5d8cd3b16e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
View file

@ -143,14 +143,14 @@ channel_detector_create(struct dfs_pattern_detector *dpd, u16 freq)
u32 sz, i; u32 sz, i;
struct channel_detector *cd; struct channel_detector *cd;
cd = kmalloc(sizeof(*cd), GFP_KERNEL); cd = kmalloc(sizeof(*cd), GFP_ATOMIC);
if (cd == NULL) if (cd == NULL)
goto fail; goto fail;
INIT_LIST_HEAD(&cd->head); INIT_LIST_HEAD(&cd->head);
cd->freq = freq; cd->freq = freq;
sz = sizeof(cd->detectors) * dpd->num_radar_types; sz = sizeof(cd->detectors) * dpd->num_radar_types;
cd->detectors = kzalloc(sz, GFP_KERNEL); cd->detectors = kzalloc(sz, GFP_ATOMIC);
if (cd->detectors == NULL) if (cd->detectors == NULL)
goto fail; goto fail;

4
drivers/net/wireless/ath/ath9k/dfs_pri_detector.c
View file

@ -218,7 +218,7 @@ static bool pulse_queue_enqueue(struct pri_detector *pde, u64 ts)
{ {
struct pulse_elem *p = pool_get_pulse_elem(); struct pulse_elem *p = pool_get_pulse_elem();
if (p == NULL) { if (p == NULL) {
p = kmalloc(sizeof(*p), GFP_KERNEL); p = kmalloc(sizeof(*p), GFP_ATOMIC);
if (p == NULL) { if (p == NULL) {
DFS_POOL_STAT_INC(pulse_alloc_error); DFS_POOL_STAT_INC(pulse_alloc_error);
return false; return false;
@ -299,7 +299,7 @@ static bool pseq_handler_create_sequences(struct pri_detector *pde,
ps.deadline_ts = ps.first_ts + ps.dur; ps.deadline_ts = ps.first_ts + ps.dur;
new_ps = pool_get_pseq_elem(); new_ps = pool_get_pseq_elem();
if (new_ps == NULL) { if (new_ps == NULL) {
new_ps = kmalloc(sizeof(*new_ps), GFP_KERNEL); new_ps = kmalloc(sizeof(*new_ps), GFP_ATOMIC);
if (new_ps == NULL) { if (new_ps == NULL) {
DFS_POOL_STAT_INC(pseq_alloc_error); DFS_POOL_STAT_INC(pseq_alloc_error);
return false; return false;