d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplify ieee80211_node_authorize and ieee80211_node_unauthorize api's

Browse Source 
MFC after:	3 days
This commit is contained in:
Sam Leffler 2005-07-22 17:36:12 +00:00
parent f62121ce8e
commit e4918ecdb9
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=148302
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/ipw/if_ipw.c
View File

@ -842,7 +842,7 @@ ipw_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg)
ieee80211_ref_node(ni);
ieee80211_sta_join(ic, ni);
ieee80211_node_authorize(ic, ni);
ieee80211_node_authorize(ni);
if (ic->ic_opmode == IEEE80211_M_STA)
ieee80211_notify_node_join(ic, ni, 1);

2
sys/dev/iwi/if_iwi.c
View File

@ -1124,7 +1124,7 @@ iwi_notification_intr(struct iwi_softc *sc, struct iwi_notif *notif)
switch (auth->state) {
case IWI_AUTHENTICATED:
ieee80211_node_authorize(ic, ic->ic_bss);
ieee80211_node_authorize(ic->ic_bss);
ieee80211_new_state(ic, IEEE80211_S_ASSOC, -1);
break;

4
sys/net80211/ieee80211_input.c
View File

@ -904,7 +904,7 @@ ieee80211_auth_open(struct ieee80211com *ic, struct ieee80211_frame *wh,
* authorized at this point so traffic can flow.
*/
if (ni->ni_authmode != IEEE80211_AUTH_8021X)
ieee80211_node_authorize(ic, ni);
ieee80211_node_authorize(ni);
break;
case IEEE80211_M_STA:
@ -1127,7 +1127,7 @@ ieee80211_auth_shared(struct ieee80211com *ic, struct ieee80211_frame *wh,
IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH,
"[%s] station authenticated (shared key)\n",
ether_sprintf(ni->ni_macaddr));
ieee80211_node_authorize(ic, ni);
ieee80211_node_authorize(ni);
break;
default:
IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_AUTH,

4
sys/net80211/ieee80211_ioctl.c
View File

@ -1685,9 +1685,9 @@ ieee80211_ioctl_setmlme(struct ieee80211com *ic, struct ieee80211req *ireq)
if (ni == NULL)
return EINVAL;
if (mlme.im_op == IEEE80211_MLME_AUTHORIZE)
ieee80211_node_authorize(ic, ni);
ieee80211_node_authorize(ni);
else
ieee80211_node_unauthorize(ic, ni);
ieee80211_node_unauthorize(ni);
ieee80211_free_node(ni);
break;
default:

8
sys/net80211/ieee80211_node.c
View File

@ -200,14 +200,16 @@ ieee80211_node_detach(struct ieee80211com *ic)
*/
void
ieee80211_node_authorize(struct ieee80211com *ic, struct ieee80211_node *ni)
ieee80211_node_authorize(struct ieee80211_node *ni)
{
struct ieee80211com *ic = ni->ni_ic;
ni->ni_flags |= IEEE80211_NODE_AUTH;
ni->ni_inact_reload = ic->ic_inact_run;
}
void
ieee80211_node_unauthorize(struct ieee80211com *ic, struct ieee80211_node *ni)
ieee80211_node_unauthorize(struct ieee80211_node *ni)
{
ni->ni_flags &= ~IEEE80211_NODE_AUTH;
}
@ -1048,7 +1050,7 @@ ieee80211_fakeup_adhoc_node(struct ieee80211_node_table *nt,
if (ic->ic_newassoc != NULL)
ic->ic_newassoc(ic, ni, 1);
/* XXX not right for 802.1x/WPA */
ieee80211_node_authorize(ic, ni);
ieee80211_node_authorize(ni);
}
return ni;
}

6
sys/net80211/ieee80211_node.h
View File

@ -182,10 +182,8 @@ ieee80211_node_is_authorized(const struct ieee80211_node *ni)
return (ni->ni_flags & IEEE80211_NODE_AUTH);
}
void ieee80211_node_authorize(struct ieee80211com *,
struct ieee80211_node *);
void ieee80211_node_unauthorize(struct ieee80211com *,
struct ieee80211_node *);
void ieee80211_node_authorize(struct ieee80211_node *);
void ieee80211_node_unauthorize(struct ieee80211_node *);
void ieee80211_begin_scan(struct ieee80211com *, int);
int ieee80211_next_scan(struct ieee80211com *);

2
sys/net80211/ieee80211_output.c
View File

@ -1131,7 +1131,7 @@ ieee80211_send_mgmt(struct ieee80211com *ic, struct ieee80211_node *ni,
IEEE80211_NODE_STAT(ni, tx_deauth);
IEEE80211_NODE_STAT_SET(ni, tx_deauth_code, arg);
ieee80211_node_unauthorize(ic, ni); /* port closed */
ieee80211_node_unauthorize(ni); /* port closed */
break;
case IEEE80211_FC0_SUBTYPE_ASSOC_REQ:

2
sys/net80211/ieee80211_proto.c
View File

@ -1068,7 +1068,7 @@ ieee80211_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg
* at this point so traffic can flow.
*/
if (ni->ni_authmode != IEEE80211_AUTH_8021X)
ieee80211_node_authorize(ic, ni);
ieee80211_node_authorize(ni);
/*
* Enable inactivity processing.
* XXX