Date: Sat, 25 Dec 2004 19:33:10 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 67690 for review Message-ID: <200412251933.iBPJXAbY056353@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=67690 Change 67690 by sam@sam_ebb on 2004/12/25 19:32:12 o accept turboG as well as g when doing erp station management o fix some pointer comparisons to check NULL instead of 0 Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#28 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#28 (text+ko) ==== @@ -1024,7 +1024,7 @@ if (ni != NULL) { /* XXX no rate negotiation; just dup */ ni->ni_rates = ic->ic_bss->ni_rates; - if (ic->ic_newassoc) + if (ic->ic_newassoc != NULL) ic->ic_newassoc(ic, ni, 1); /* XXX not right for 802.1x/WPA */ ieee80211_node_authorize(ic, ni); @@ -1599,7 +1599,8 @@ IEEE80211_AID_SET(ni->ni_associd, ic->ic_aid_bitmap); ic->ic_sta_assoc++; newassoc = 1; - if (ic->ic_curmode == IEEE80211_MODE_11G) + if (ic->ic_curmode == IEEE80211_MODE_11G || + ic->ic_curmode == IEEE80211_MODE_TURBO_G) ieee80211_node_join_11g(ic, ni); } else newassoc = 0; @@ -1615,7 +1616,7 @@ ); /* give driver a chance to setup state like ni_txrate */ - if (ic->ic_newassoc) + if (ic->ic_newassoc != NULL) ic->ic_newassoc(ic, ni, newassoc); ni->ni_inact_reload = ic->ic_inact_auth; ni->ni_inact = ni->ni_inact_reload; @@ -1633,7 +1634,8 @@ ieee80211_node_leave_11g(struct ieee80211com *ic, struct ieee80211_node *ni) { - KASSERT(ic->ic_curmode == IEEE80211_MODE_11G, + KASSERT(ic->ic_curmode == IEEE80211_MODE_11G || + ic->ic_curmode == IEEE80211_MODE_TURBO_G, ("not in 11g, curmode %x", ic->ic_curmode)); /* @@ -1721,7 +1723,8 @@ ni->ni_associd = 0; ic->ic_sta_assoc--; - if (ic->ic_curmode == IEEE80211_MODE_11G) + if (ic->ic_curmode == IEEE80211_MODE_11G || + ic->ic_curmode == IEEE80211_MODE_TURBO_G) ieee80211_node_leave_11g(ic, ni); /* * Cleanup station state. In particular clear various
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200412251933.iBPJXAbY056353>