projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: fix lockdep warning
[cascardo/linux.git]
/
net
/
mac80211
/
agg-rx.c
diff --git
a/net/mac80211/agg-rx.c
b/net/mac80211/agg-rx.c
index
720b7a8
..
f138b19
100644
(file)
--- a/
net/mac80211/agg-rx.c
+++ b/
net/mac80211/agg-rx.c
@@
-129,9
+129,7
@@
static void sta_rx_agg_reorder_timer_expired(unsigned long data)
timer_to_tid[0]);
rcu_read_lock();
timer_to_tid[0]);
rcu_read_lock();
- spin_lock(&sta->lock);
ieee80211_release_reorder_timeout(sta, *ptid);
ieee80211_release_reorder_timeout(sta, *ptid);
- spin_unlock(&sta->lock);
rcu_read_unlock();
}
rcu_read_unlock();
}
@@
-256,7
+254,7
@@
void ieee80211_process_addba_request(struct ieee80211_local *local,
}
/* prepare A-MPDU MLME for Rx aggregation */
}
/* prepare A-MPDU MLME for Rx aggregation */
- tid_agg_rx = kmalloc(sizeof(struct tid_ampdu_rx), GFP_
ATOMIC
);
+ tid_agg_rx = kmalloc(sizeof(struct tid_ampdu_rx), GFP_
KERNEL
);
if (!tid_agg_rx) {
#ifdef CONFIG_MAC80211_HT_DEBUG
if (net_ratelimit())
if (!tid_agg_rx) {
#ifdef CONFIG_MAC80211_HT_DEBUG
if (net_ratelimit())
@@
-280,9
+278,9
@@
void ieee80211_process_addba_request(struct ieee80211_local *local,
/* prepare reordering buffer */
tid_agg_rx->reorder_buf =
/* prepare reordering buffer */
tid_agg_rx->reorder_buf =
- kcalloc(buf_size, sizeof(struct sk_buff *), GFP_
ATOMIC
);
+ kcalloc(buf_size, sizeof(struct sk_buff *), GFP_
KERNEL
);
tid_agg_rx->reorder_time =
tid_agg_rx->reorder_time =
- kcalloc(buf_size, sizeof(unsigned long), GFP_
ATOMIC
);
+ kcalloc(buf_size, sizeof(unsigned long), GFP_
KERNEL
);
if (!tid_agg_rx->reorder_buf || !tid_agg_rx->reorder_time) {
#ifdef CONFIG_MAC80211_HT_DEBUG
if (net_ratelimit())
if (!tid_agg_rx->reorder_buf || !tid_agg_rx->reorder_time) {
#ifdef CONFIG_MAC80211_HT_DEBUG
if (net_ratelimit())