Deleted Added
full compact
ieee80211_node.c (179390) ieee80211_node.c (179640)
1/*-
2 * Copyright (c) 2001 Atsushi Onoe
3 * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 11 unchanged lines hidden (view full) ---

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2001 Atsushi Onoe
3 * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 11 unchanged lines hidden (view full) ---

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_node.c 179390 2008-05-28 23:18:17Z sam $");
28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_node.c 179640 2008-06-07 17:43:41Z sam $");
29
30#include "opt_wlan.h"
31
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/mbuf.h>
35#include <sys/malloc.h>
36#include <sys/kernel.h>

--- 2135 unchanged lines hidden (view full) ---

2172 * It would be good to search the bitmap
2173 * more efficiently, but this will do for now.
2174 */
2175 for (aid = 1; aid < vap->iv_max_aid; aid++) {
2176 if (!IEEE80211_AID_ISSET(vap, aid))
2177 break;
2178 }
2179 if (aid >= vap->iv_max_aid) {
29
30#include "opt_wlan.h"
31
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/mbuf.h>
35#include <sys/malloc.h>
36#include <sys/kernel.h>

--- 2135 unchanged lines hidden (view full) ---

2172 * It would be good to search the bitmap
2173 * more efficiently, but this will do for now.
2174 */
2175 for (aid = 1; aid < vap->iv_max_aid; aid++) {
2176 if (!IEEE80211_AID_ISSET(vap, aid))
2177 break;
2178 }
2179 if (aid >= vap->iv_max_aid) {
2180 IEEE80211_SEND_MGMT(ni, resp,
2181 IEEE80211_REASON_ASSOC_TOOMANY);
2180 IEEE80211_SEND_MGMT(ni, resp, IEEE80211_STATUS_TOOMANY);
2182 ieee80211_node_leave(ni);
2183 return;
2184 }
2185 ni->ni_associd = aid | 0xc000;
2186 ni->ni_jointime = time_uptime;
2187 IEEE80211_LOCK(ic);
2188 IEEE80211_AID_SET(vap, ni->ni_associd);
2189 vap->iv_sta_assoc++;

--- 294 unchanged lines hidden ---
2181 ieee80211_node_leave(ni);
2182 return;
2183 }
2184 ni->ni_associd = aid | 0xc000;
2185 ni->ni_jointime = time_uptime;
2186 IEEE80211_LOCK(ic);
2187 IEEE80211_AID_SET(vap, ni->ni_associd);
2188 vap->iv_sta_assoc++;

--- 294 unchanged lines hidden ---