diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-23 16:25:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-23 16:25:49 -0800 |
| commit | aca361c1a0dc0165ac3148137983cb4b1458b5c1 (patch) | |
| tree | 3527ff422fe90e97657d5996499fa4a9d30e2d5a /drivers/net/wireless/hostap/hostap_ap.c | |
| parent | cec6062037783a762aa5606b06b8bc5c14d9657f (diff) | |
| parent | 9b7c84899ea6bfc4f8932a83b28db313e7397bd1 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (45 commits)
[PATCH] Restore channel setting after scan.
[PATCH] hostap: Fix memory leak on PCI probe error path
[PATCH] hostap: Remove dead code (duplicated idx != 0)
[PATCH] hostap: Fix unlikely read overrun in CIS parsing
[PATCH] hostap: Fix double free in prism2_config() error path
[PATCH] hostap: Fix ap_add_sta() return value verification
[PATCH] hostap: Fix hw reset after CMDCODE_ACCESS_WRITE timeout
[PATCH] wireless/airo: cache wireless scans
[PATCH] wireless/airo: define default MTU
[PATCH] wireless/airo: clean up printk usage to print device name
[PATCH] WE-20 for kernel 2.6.16
[PATCH] softmac: remove function_enter()
[PATCH] skge: version 1.5
[PATCH] skge: compute available ring buffers
[PATCH] skge: dont free skb until multi-part transmit complete
[PATCH] skge: multicast statistics fix
[PATCH] skge: rx_reuse called twice
[PATCH] skge: dont use dev_alloc_skb for rx buffs
[PATCH] skge: align receive buffers
[PATCH] sky2: dont need to use dev_kfree_skb_any
...
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 753a1de6664..06c3fa32b31 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) if (ret == 1) { sta = ap_add_sta(ap, sta_addr); if (!sta) - ret = -1; + return -1; sta->flags = WLAN_STA_AUTH | WLAN_STA_ASSOC; sta->ap = 1; memset(sta->supported_rates, 0, sizeof(sta->supported_rates)); |