diff options
| -rw-r--r-- | usr/src/uts/common/io/net80211/net80211_output.c | 4 | ||||
| -rw-r--r-- | usr/src/uts/common/io/net80211/net80211_proto.c | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/usr/src/uts/common/io/net80211/net80211_output.c b/usr/src/uts/common/io/net80211/net80211_output.c index 2f68bac444..b83cf5194c 100644 --- a/usr/src/uts/common/io/net80211/net80211_output.c +++ b/usr/src/uts/common/io/net80211/net80211_output.c @@ -1,6 +1,8 @@ /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * + * Copyright 2016 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org> */ /* @@ -948,10 +950,10 @@ ieee80211_beacon_update(ieee80211com_t *ic, ieee80211_node_t *in, * Finally, if an ACM policy is setup (in station mode) it's * applied. */ +/* ARGSUSED */ int ieee80211_classify(struct ieee80211com *ic, mblk_t *m, struct ieee80211_node *ni) -/* ARGSUSED */ { int ac; diff --git a/usr/src/uts/common/io/net80211/net80211_proto.c b/usr/src/uts/common/io/net80211/net80211_proto.c index ebb54b6ec4..26dbf30b6f 100644 --- a/usr/src/uts/common/io/net80211/net80211_proto.c +++ b/usr/src/uts/common/io/net80211/net80211_proto.c @@ -4,6 +4,10 @@ */ /* + * Copyright 2016 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org> + */ + +/* * Copyright (c) 2001 Atsushi Onoe * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting * All rights reserved. @@ -717,7 +721,7 @@ ieee80211_wme_updateparams(struct ieee80211com *ic) wme->wme_update(ic); ieee80211_dbg(IEEE80211_MSG_WME, "ieee80211_wme_updateparams(): " - "%s: WME params updated, cap_info 0x%x\n", + "WME params updated, cap_info 0x%x\n", ic->ic_opmode == IEEE80211_M_STA ? wme->wme_wmeChanParams.cap_info : wme->wme_bssChanParams.cap_info); @@ -914,7 +918,8 @@ ieee80211_newstate(ieee80211com_t *ic, enum ieee80211_state nstate, int arg) } break; case IEEE80211_S_ASSOC: - ASSERT(ic->ic_opmode == IEEE80211_M_STA); + ASSERT(ic->ic_opmode == IEEE80211_M_STA || + ic->ic_opmode == IEEE80211_M_IBSS); switch (ostate) { case IEEE80211_S_INIT: case IEEE80211_S_SCAN: |