From e4918ecdb96b5212b5d97549f4c9bbcea50f24fd Mon Sep 17 00:00:00 2001 From: Sam Leffler Date: Fri, 22 Jul 2005 17:36:12 +0000 Subject: [PATCH] simplify ieee80211_node_authorize and ieee80211_node_unauthorize api's MFC after: 3 days --- sys/dev/ipw/if_ipw.c | 2 +- sys/dev/iwi/if_iwi.c | 2 +- sys/net80211/ieee80211_input.c | 4 ++-- sys/net80211/ieee80211_ioctl.c | 4 ++-- sys/net80211/ieee80211_node.c | 8 +++++--- sys/net80211/ieee80211_node.h | 6 ++---- sys/net80211/ieee80211_output.c | 2 +- sys/net80211/ieee80211_proto.c | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sys/dev/ipw/if_ipw.c b/sys/dev/ipw/if_ipw.c index 7bf90ad7a42..60ec63fbde6 100644 --- a/sys/dev/ipw/if_ipw.c +++ b/sys/dev/ipw/if_ipw.c @@ -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); diff --git a/sys/dev/iwi/if_iwi.c b/sys/dev/iwi/if_iwi.c index 8d4312d484a..61474dae136 100644 --- a/sys/dev/iwi/if_iwi.c +++ b/sys/dev/iwi/if_iwi.c @@ -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; diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index 5cef95da5e2..bd5eff961bc 100644 --- a/sys/net80211/ieee80211_input.c +++ b/sys/net80211/ieee80211_input.c @@ -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, diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c index 2a479205c6c..3396934d2e9 100644 --- a/sys/net80211/ieee80211_ioctl.c +++ b/sys/net80211/ieee80211_ioctl.c @@ -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: diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index 835ec4678b0..be80bd333b5 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -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; } diff --git a/sys/net80211/ieee80211_node.h b/sys/net80211/ieee80211_node.h index c7ac7c11a48..0d894904baf 100644 --- a/sys/net80211/ieee80211_node.h +++ b/sys/net80211/ieee80211_node.h @@ -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 *); diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c index f45aa0f9d75..024099c576e 100644 --- a/sys/net80211/ieee80211_output.c +++ b/sys/net80211/ieee80211_output.c @@ -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: diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c index 2ab0e387dd1..0288b0d45eb 100644 --- a/sys/net80211/ieee80211_proto.c +++ b/sys/net80211/ieee80211_proto.c @@ -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