svn commit: r367371 - stable/12/sys/dev/iwm

[Bjoern A. Zeeb]

Author: bz
Date: Thu Nov  5 11:56:49 2020
New Revision: 367371
URL: https://svnweb.freebsd.org/changeset/base/367371

Log:
  MFC r365633:
  
    iwm: fix regression from r365419 (ieee80211_media_change())
  
    In r365419 ieee80211_media_change() callers were updated to not longer
    act on the obselete ENETRESET return code.
    While in the old days iwm has done a stop/init cycle in these cases,
    this was not executed since r193340.
    As a consequence simplify iwm code as well by passing ieee80211_media_change()
    right to ieee80211_vap_attach() as there is no more need for a local
    implementation.
  
    The actual problem was fixed in stable/12 since r365608;  this just
    reduces changes to HEAD.
  
  PR:		248955

Modified:
  stable/12/sys/dev/iwm/if_iwm.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/iwm/if_iwm.c
==============================================================================
--- stable/12/sys/dev/iwm/if_iwm.c	Thu Nov  5 11:37:14 2020	(r367370)
+++ stable/12/sys/dev/iwm/if_iwm.c	Thu Nov  5 11:56:49 2020	(r367371)
@@ -354,7 +354,6 @@ static struct ieee80211_node *
 static uint8_t	iwm_rate_from_ucode_rate(uint32_t);
 static int	iwm_rate2ridx(struct iwm_softc *, uint8_t);
 static void	iwm_setrates(struct iwm_softc *, struct iwm_node *, int);
-static int	iwm_media_change(struct ifnet *);
 static int	iwm_newstate(struct ieee80211vap *, enum ieee80211_state, int);
 static void	iwm_endscan_cb(void *, int);
 static int	iwm_send_bt_init_conf(struct iwm_softc *);
@@ -4412,31 +4411,6 @@ iwm_setrates(struct iwm_softc *sc, struct iwm_node *in
 	}
 }
 
-static int
-iwm_media_change(struct ifnet *ifp)
-{
-#if 0
-	struct ieee80211vap *vap = ifp->if_softc;
-	struct ieee80211com *ic = vap->iv_ic;
-	struct iwm_softc *sc = ic->ic_softc;
-#endif
-	int error;
-
-	error = ieee80211_media_change(ifp);
-	if (error != 0)
-		return (error);
-
-#if 0
-	IWM_LOCK(sc);
-	if (ic->ic_nrunning > 0) {
-		iwm_stop(sc);
-		iwm_init(sc);
-	}
-	IWM_UNLOCK(sc);
-#endif
-	return (0);
-}
-
 static void
 iwm_bring_down_firmware(struct iwm_softc *sc, struct ieee80211vap *vap)
 {
@@ -6431,8 +6405,8 @@ iwm_vap_create(struct ieee80211com *ic, const char nam
 
 	ieee80211_ratectl_init(vap);
 	/* Complete setup. */
-	ieee80211_vap_attach(vap, iwm_media_change, ieee80211_media_status,
-	    mac);
+	ieee80211_vap_attach(vap, ieee80211_media_change,
+	    ieee80211_media_status, mac);
 	ic->ic_opmode = opmode;
 
 	return vap;