diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-02-26 00:39:28 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-02-28 09:13:10 -0500 |
| commit | 03147dfc8a3756439f0cc54aa181f30067f1b21b (patch) | |
| tree | 215d8456d02c9f7dd8f7ed54da8365f0117d4e00 /net | |
| parent | 53b3f8e47a38f39836da1c9f9d2ea9a9c164c8f4 (diff) | |
| download | linux-03147dfc8a3756439f0cc54aa181f30067f1b21b.tar.gz linux-03147dfc8a3756439f0cc54aa181f30067f1b21b.tar.bz2 linux-03147dfc8a3756439f0cc54aa181f30067f1b21b.zip | |
mac80211: fix kmalloc vs. net_ratelimit
The "goto end;" part definitely must not be rate limited.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/ieee80211_sta.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c index 2019b4f0528d..9aeed5320228 100644 --- a/net/mac80211/ieee80211_sta.c +++ b/net/mac80211/ieee80211_sta.c @@ -1116,9 +1116,10 @@ static void ieee80211_sta_process_addba_request(struct net_device *dev, /* prepare reordering buffer */ tid_agg_rx->reorder_buf = kmalloc(buf_size * sizeof(struct sk_buf *), GFP_ATOMIC); - if ((!tid_agg_rx->reorder_buf) && net_ratelimit()) { - printk(KERN_ERR "can not allocate reordering buffer " - "to tid %d\n", tid); + if (!tid_agg_rx->reorder_buf) { + if (net_ratelimit()) + printk(KERN_ERR "can not allocate reordering buffer " + "to tid %d\n", tid); goto end; } memset(tid_agg_rx->reorder_buf, 0, |