Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/net80211 net80211: Initialise the interface with a decen...



details:   https://anonhg.NetBSD.org/src/rev/6b07c36b8754
branches:  trunk
changeset: 1014934:6b07c36b8754
user:      roy <roy%NetBSD.org@localhost>
date:      Tue Oct 06 23:51:05 2020 +0000

description:
net80211: Initialise the interface with a decent link state.

Link state transitions to UP when a node is joined and DOWN when left.
This means that with the interface UP, the link state could be UNKNOWN
for a while, implying it can be used in BSS mode.
Which is of course false.

Add a function to set an initial link state based on the operating mode.
Also call this when the operating mode changes.

Basically in BSS and MONITOR it starts off down.
BSS will transition UP and DOWN as before, MONITOR will stay down.
IBSS, AHDEMO and HOSTAP will remain as link unknown because the state is
..... unknown.

diffstat:

 sys/net80211/ieee80211.c |  31 +++++++++++++++++++++++++++++--
 1 files changed, 29 insertions(+), 2 deletions(-)

diffs (66 lines):

diff -r 04c7b4f35458 -r 6b07c36b8754 sys/net80211/ieee80211.c
--- a/sys/net80211/ieee80211.c  Tue Oct 06 23:28:13 2020 +0000
+++ b/sys/net80211/ieee80211.c  Tue Oct 06 23:51:05 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ieee80211.c,v 1.59 2020/03/15 23:04:51 thorpej Exp $   */
+/*     $NetBSD: ieee80211.c,v 1.60 2020/10/06 23:51:05 roy Exp $       */
 /*-
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,7 +36,7 @@
 __FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.22 2005/08/10 16:22:29 sam Exp $");
 #endif
 #ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211.c,v 1.59 2020/03/15 23:04:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211.c,v 1.60 2020/10/06 23:51:05 roy Exp $");
 #endif
 
 /*
@@ -150,6 +150,30 @@
        return ENETRESET;
 }
 
+static void
+ieee80211_init_link_state(struct ieee80211com *ic)
+{
+       struct ifnet *ifp = ic->ic_ifp;
+
+       /*
+        * Link state does not make sense in IBSS or HOSTAP modes.
+        * We know that the link in MONITOR mode is DOWN as we cannot
+        * transmit, only monitor.
+        * That leaves BSS mode, which starts off DOWN and will
+        * transition to UP when it joins a node.
+        */
+       switch (ic->ic_opmode) {
+       case IEEE80211_M_AHDEMO:
+       case IEEE80211_M_HOSTAP:
+       case IEEE80211_M_IBSS:
+               if_link_state_change(ifp, LINK_STATE_UNKNOWN);
+               break;
+       default:
+               if_link_state_change(ifp, LINK_STATE_DOWN);
+               break;
+       }
+}
+
 void
 ieee80211_ifattach(struct ieee80211com *ic)
 {
@@ -246,6 +270,8 @@
         */
        if (ic->ic_reset == NULL)
                ic->ic_reset = ieee80211_default_reset;
+
+       ieee80211_init_link_state(ic);
 }
 
 void
@@ -703,6 +729,7 @@
                 */
                ieee80211_reset_erp(ic);
                ieee80211_wme_initparams(ic);   /* after opmode change */
+               ieee80211_init_link_state(ic);  /* after opmode change */
                error = ENETRESET;
        }
 #ifdef notdef



Home | Main Index | Thread Index | Old Index