Commit 03147dfc authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville

mac80211: fix kmalloc vs. net_ratelimit

The "goto end;" part definitely must not be rate limited.
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 53b3f8e4
...@@ -1116,7 +1116,8 @@ static void ieee80211_sta_process_addba_request(struct net_device *dev, ...@@ -1116,7 +1116,8 @@ static void ieee80211_sta_process_addba_request(struct net_device *dev,
/* prepare reordering buffer */ /* prepare reordering buffer */
tid_agg_rx->reorder_buf = tid_agg_rx->reorder_buf =
kmalloc(buf_size * sizeof(struct sk_buf *), GFP_ATOMIC); kmalloc(buf_size * sizeof(struct sk_buf *), GFP_ATOMIC);
if ((!tid_agg_rx->reorder_buf) && net_ratelimit()) { if (!tid_agg_rx->reorder_buf) {
if (net_ratelimit())
printk(KERN_ERR "can not allocate reordering buffer " printk(KERN_ERR "can not allocate reordering buffer "
"to tid %d\n", tid); "to tid %d\n", tid);
goto end; goto end;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment