o use the new association callback to notify the driver when joining a bss

  in sta and adhoc modes; this should've been done forever ago as most all
  drivers use this hook to set per-station transmit parameters such as for
  tx rate control
o adjust drivers to remove explicit calls to the driver newassoc method

8 files changed, 13 insertions, 33 deletions

diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c
index 4a4395c..b4a8dd8 100644
--- a/sys/dev/ath/if_ath.c
+++ b/sys/dev/ath/if_ath.c
@@ -5722,10 +5722,6 @@ ath_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
 			break;
 		case IEEE80211_M_STA:
 			/*
-			 * Fakeup since we're not called by net80211.
-			 */
-			ath_newassoc(ni, 1);
-			/*
 			 * Defer beacon timer configuration to the next
 			 * beacon frame so we have a current TSF to use
 			 * (any TSF collected when scanning is likely old).
diff --git a/sys/dev/iwn/if_iwn.c b/sys/dev/iwn/if_iwn.c
index 8421944..947ecf5 100644
--- a/sys/dev/iwn/if_iwn.c
+++ b/sys/dev/iwn/if_iwn.c
@@ -3648,11 +3648,6 @@ iwn_run(struct iwn_softc *sc)
 		return error;
 	}
 
-	if (ic->ic_opmode == IEEE80211_M_STA) {
-		/* fake a join to init the tx rate */
-		iwn_newassoc(ni, 1);
-	}
-
 	error = iwn_init_sensitivity(sc);
 	if (error != 0) {
 		device_printf(sc->sc_dev,
diff --git a/sys/dev/ral/rt2560.c b/sys/dev/ral/rt2560.c
index 013a0e2..a0b06a3 100644
--- a/sys/dev/ral/rt2560.c
+++ b/sys/dev/ral/rt2560.c
@@ -831,13 +831,8 @@ rt2560_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
 		/* turn assocation led on */
 		rt2560_update_led(sc, 1, 0);
 
-		if (vap->iv_opmode != IEEE80211_M_MONITOR) {
-			if (vap->iv_opmode == IEEE80211_M_STA) {
-				/* fake a join to init the tx rate */
-				rt2560_newassoc(ni, 1);
-			}
+		if (vap->iv_opmode != IEEE80211_M_MONITOR)
 			rt2560_enable_tsf_sync(sc);
-		}
 	}
 	return error;
 }
diff --git a/sys/dev/ral/rt2661.c b/sys/dev/ral/rt2661.c
index ae31d5e8..215a1b7 100644
--- a/sys/dev/ral/rt2661.c
+++ b/sys/dev/ral/rt2661.c
@@ -830,13 +830,8 @@ rt2661_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
 			if (error != 0)
 				return error;
 		}
-		if (vap->iv_opmode != IEEE80211_M_MONITOR) {
-			if (vap->iv_opmode == IEEE80211_M_STA) {
-				/* fake a join to init the tx rate */
-				rt2661_newassoc(ni, 1);
-			}
+		if (vap->iv_opmode != IEEE80211_M_MONITOR)
 			rt2661_enable_tsf_sync(sc);
-		}
 	}
 	return error;
 }
diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c
index b866b8f..fa17945 100644
--- a/sys/dev/usb/if_zyd.c
+++ b/sys/dev/usb/if_zyd.c
@@ -740,11 +740,6 @@ zyd_task(void *arg)
 			IEEE80211_ADDR_COPY(sc->sc_bssid, ni->ni_bssid);
 			zyd_set_bssid(sc, sc->sc_bssid);
 		}
-
-		if (vap->iv_opmode == IEEE80211_M_STA) {
-			/* fake a join to init the tx rate */
-			zyd_newassoc(ni, 1);
-		}
 		break;
 	}
 	default:
diff --git a/sys/dev/wpi/if_wpi.c b/sys/dev/wpi/if_wpi.c
index cbe8551..bb7cc24 100644
--- a/sys/dev/wpi/if_wpi.c
+++ b/sys/dev/wpi/if_wpi.c
@@ -2522,11 +2522,6 @@ wpi_run(struct wpi_softc *sc, struct ieee80211vap *vap)
 		return error;
 	}
 
-	if (vap->iv_opmode == IEEE80211_M_STA) {
-		/* fake a join to init the tx rate */
-		wpi_newassoc(ni, 1);
-	}
-
 	/* link LED always on while associated */
 	wpi_set_led(sc, WPI_LED_LINK, 0, 1);
 
diff --git a/sys/net80211/ieee80211_adhoc.c b/sys/net80211/ieee80211_adhoc.c
index 68fe32d..e9b8128 100644
--- a/sys/net80211/ieee80211_adhoc.c
+++ b/sys/net80211/ieee80211_adhoc.c
@@ -104,9 +104,7 @@ adhoc_vattach(struct ieee80211vap *vap)
 static int
 adhoc_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
 {
-#ifdef IEEE80211_DEBUG
 	struct ieee80211com *ic = vap->iv_ic;
-#endif
 	struct ieee80211_node *ni;
 	enum ieee80211_state ostate;
 
@@ -208,6 +206,12 @@ adhoc_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
 		 */
 		if (ni->ni_authmode != IEEE80211_AUTH_8021X)
 			ieee80211_node_authorize(ni);
+		/*
+		 * Fake association when joining an existing bss.
+		 */
+		if (!IEEE80211_ADDR_EQ(ni->ni_macaddr, vap->iv_myaddr) &&
+		    ic->ic_newassoc != NULL)
+			ic->ic_newassoc(ni, ostate != IEEE80211_S_RUN);
 		break;
 	case IEEE80211_S_SLEEP:
 		ieee80211_sta_pwrsave(vap, 0);
diff --git a/sys/net80211/ieee80211_sta.c b/sys/net80211/ieee80211_sta.c
index 293616e..ebb28aa 100644
--- a/sys/net80211/ieee80211_sta.c
+++ b/sys/net80211/ieee80211_sta.c
@@ -400,6 +400,11 @@ sta_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
 		 */
 		if (ni->ni_authmode != IEEE80211_AUTH_8021X)
 			ieee80211_node_authorize(ni);
+		/*
+		 * Fake association when joining an existing bss.
+		 */
+		if (ic->ic_newassoc != NULL)
+			ic->ic_newassoc(vap->iv_bss, ostate != IEEE80211_S_RUN);
 		break;
 	case IEEE80211_S_SLEEP:
 		ieee80211_sta_pwrsave(vap, 0);