diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-05-17 13:57:43 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-05-17 13:57:43 -0400 |
| commit | 6fe70aae0d128339febfabc073ba4c4a03de4f45 (patch) | |
| tree | 711dff90df5ca4e07b5bddf11b2819e5cf2b7a93 /drivers/net/wireless/hostap/hostap_80211_rx.c | |
| parent | 278554bd6579206921f5d8a523649a7a57f8850d (diff) | |
| parent | 0c348d7c1422d59a86d6fb37b53d75788043e50b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_80211_rx.c')
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_80211_rx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/hostap/hostap_80211_rx.c b/drivers/net/wireless/hostap/hostap_80211_rx.c index f4c56121d387..e0b3e8d406b3 100644 --- a/drivers/net/wireless/hostap/hostap_80211_rx.c +++ b/drivers/net/wireless/hostap/hostap_80211_rx.c | |||
| @@ -355,8 +355,7 @@ static struct hostap_bss_info *__hostap_add_bss(local_info_t *local, u8 *bssid, | |||
| 355 | list_del(&bss->list); | 355 | list_del(&bss->list); |
| 356 | local->num_bss_info--; | 356 | local->num_bss_info--; |
| 357 | } else { | 357 | } else { |
| 358 | bss = (struct hostap_bss_info *) | 358 | bss = kmalloc(sizeof(*bss), GFP_ATOMIC); |
| 359 | kmalloc(sizeof(*bss), GFP_ATOMIC); | ||
| 360 | if (bss == NULL) | 359 | if (bss == NULL) |
| 361 | return NULL; | 360 | return NULL; |
| 362 | } | 361 | } |