svn commit: r206765 - head/sys/dev/ipw

[Bernhard Schmidt]

Author: bschmidt
Date: Sat Apr 17 18:16:14 2010
New Revision: 206765
URL: http://svn.freebsd.org/changeset/base/206765

Log:
  - Make ipw usable again by moving directly into ASSOC state.
  - No need to manually switch to RUN state, assoc response takes care
    of that.
  
  Approved by:	rpaulo (mentor)

Modified:
  head/sys/dev/ipw/if_ipw.c

Modified: head/sys/dev/ipw/if_ipw.c
==============================================================================
--- head/sys/dev/ipw/if_ipw.c	Sat Apr 17 18:14:49 2010	(r206764)
+++ head/sys/dev/ipw/if_ipw.c	Sat Apr 17 18:16:14 2010	(r206765)
@@ -904,6 +904,13 @@ ipw_newstate(struct ieee80211vap *vap, e
 		break;
 
 	case IEEE80211_S_AUTH:
+		/*
+		 * Move to ASSOC state after the ipw_assoc() call.  Firmware
+		 * takes care of authentication, after the call we'll receive
+		 * only an assoc response which would otherwise be discared
+		 * if we are still in AUTH state.
+		 */
+		nstate = IEEE80211_S_ASSOC;
 		ipw_assoc(ic, vap);
 		break;
 
@@ -1021,7 +1028,6 @@ ipw_rx_newstate_intr(struct ipw_softc *s
 		}
 		sc->flags &= ~IPW_FLAG_ASSOCIATING;
 		sc->flags |= IPW_FLAG_ASSOCIATED;
-		ieee80211_new_state(vap, IEEE80211_S_RUN, -1);
 		break;
 
 	case IPW_STATE_SCANNING: