From owner-svn-src-all@FreeBSD.ORG  Tue Jun 29 21:52:41 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2D061106564A;
	Tue, 29 Jun 2010 21:52:41 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1DEA78FC0C;
	Tue, 29 Jun 2010 21:52:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5TLqfFg046927;
	Tue, 29 Jun 2010 21:52:41 GMT (envelope-from weongyo@svn.freebsd.org)
Received: (from weongyo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5TLqeEN046925;
	Tue, 29 Jun 2010 21:52:41 GMT (envelope-from weongyo@svn.freebsd.org)
Message-Id: <201006292152.o5TLqeEN046925@svn.freebsd.org>
From: Weongyo Jeong <weongyo@FreeBSD.org>
Date: Tue, 29 Jun 2010 21:52:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209597 - head/sys/dev/bwi
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Jun 2010 21:52:41 -0000

Author: weongyo
Date: Tue Jun 29 21:52:40 2010
New Revision: 209597
URL: http://svn.freebsd.org/changeset/base/209597

Log:
  Fixes NULL pointer reference that it's occurred when the state is
  changed to RUN because ic->ic_newassoc isn't set anywhere now.  In the
  previous bwi_newassoc() is used to initialize AMRR rate routines.
  
  Tested by:	Warren Block <wblock at wonkity.com>
  MFC after:	3 days

Modified:
  head/sys/dev/bwi/if_bwi.c

Modified: head/sys/dev/bwi/if_bwi.c
==============================================================================
--- head/sys/dev/bwi/if_bwi.c	Tue Jun 29 20:55:12 2010	(r209596)
+++ head/sys/dev/bwi/if_bwi.c	Tue Jun 29 21:52:40 2010	(r209597)
@@ -1774,7 +1774,6 @@ bwi_newstate(struct ieee80211vap *vap, e
 	enum ieee80211_state ostate = vap->iv_state;
 	struct bwi_softc *sc = ifp->if_softc;
 	struct bwi_mac *mac;
-	struct ieee80211_node *ni = vap->iv_bss;
 	int error;
 
 	BWI_LOCK(sc);
@@ -1822,10 +1821,6 @@ bwi_newstate(struct ieee80211vap *vap, e
 #else
 		sc->sc_txpwrcb_type = BWI_TXPWR_CALIB;
 #endif
-		if (vap->iv_opmode == IEEE80211_M_STA) {
-			/* fake a join to init the tx rate */
-			ic->ic_newassoc(ni, 1);
-		}
 
 		callout_reset(&sc->sc_calib_ch, hz, bwi_calibrate, sc);
 	}