diff options
| author | David S. Miller <davem@davemloft.net> | 2008-02-28 11:03:29 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-28 11:03:29 -0800 |
| commit | 60717f7e761ca04925d17e90e556e689ab134cdc (patch) | |
| tree | f0daeeb9e5797a8b492453850f3bb764d94c4584 /net | |
| parent | fbabbed8284d1526ed01754ecd4fabdb941a1ff2 (diff) | |
| parent | 2d8d4fdf78488f3362dccfd2a6bfdb4bc65c0858 (diff) | |
| download | kernel_goldelico_gta04-60717f7e761ca04925d17e90e556e689ab134cdc.zip kernel_goldelico_gta04-60717f7e761ca04925d17e90e556e689ab134cdc.tar.gz kernel_goldelico_gta04-60717f7e761ca04925d17e90e556e689ab134cdc.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
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 2019b4f..9aeed53 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, |