diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /drivers/net/wireless/hostap/hostap_ap.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_ap.c')
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_ap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c index 753a1de6664b..06c3fa32b310 100644 --- a/drivers/net/wireless/hostap/hostap_ap.c +++ b/drivers/net/wireless/hostap/hostap_ap.c | |||
| @@ -3141,7 +3141,7 @@ int hostap_add_sta(struct ap_data *ap, u8 *sta_addr) | |||
| 3141 | if (ret == 1) { | 3141 | if (ret == 1) { |
| 3142 | sta = ap_add_sta(ap, sta_addr); | 3142 | sta = ap_add_sta(ap, sta_addr); |
| 3143 | if (!sta) | 3143 | if (!sta) |
| 3144 | ret = -1; | 3144 | return -1; |
| 3145 | sta->flags = WLAN_STA_AUTH | WLAN_STA_ASSOC; | 3145 | sta->flags = WLAN_STA_AUTH | WLAN_STA_ASSOC; |
| 3146 | sta->ap = 1; | 3146 | sta->ap = 1; |
| 3147 | memset(sta->supported_rates, 0, sizeof(sta->supported_rates)); | 3147 | memset(sta->supported_rates, 0, sizeof(sta->supported_rates)); |