From owner-svn-src-user@FreeBSD.ORG Fri Apr 17 03:49:27 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 54941106566C; Fri, 17 Apr 2009 03:49:27 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2A1938FC15; Fri, 17 Apr 2009 03:49:27 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3H3nRMM006820; Fri, 17 Apr 2009 03:49:27 GMT (envelope-from thompsa@svn.freebsd.org) Received: (from thompsa@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3H3nRbp006818; Fri, 17 Apr 2009 03:49:27 GMT (envelope-from thompsa@svn.freebsd.org) Message-Id: <200904170349.n3H3nRbp006818@svn.freebsd.org> From: Andrew Thompson Date: Fri, 17 Apr 2009 03:49:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191191 - user/thompsa/vaptq/sys/dev/usb/wlan X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Apr 2009 03:49:27 -0000 Author: thompsa Date: Fri Apr 17 03:49:26 2009 New Revision: 191191 URL: http://svn.freebsd.org/changeset/base/191191 Log: Eliminate sc->sc_state. Modified: user/thompsa/vaptq/sys/dev/usb/wlan/if_uath.c user/thompsa/vaptq/sys/dev/usb/wlan/if_uathvar.h Modified: user/thompsa/vaptq/sys/dev/usb/wlan/if_uath.c ============================================================================== --- user/thompsa/vaptq/sys/dev/usb/wlan/if_uath.c Fri Apr 17 03:45:15 2009 (r191190) +++ user/thompsa/vaptq/sys/dev/usb/wlan/if_uath.c Fri Apr 17 03:49:26 2009 (r191191) @@ -1602,6 +1602,7 @@ uath_tx_start(struct uath_softc *sc, str { struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; + struct ieee80211vap *vap = ni->ni_vap; struct uath_chunk *chunk; struct uath_tx_desc *desc; const struct ieee80211_frame *wh; @@ -1677,9 +1678,9 @@ uath_tx_start(struct uath_softc *sc, str m_freem(m0); return (EIO); } - if (sc->sc_state == IEEE80211_S_AUTH || - sc->sc_state == IEEE80211_S_ASSOC || - sc->sc_state == IEEE80211_S_RUN) + if (vap->iv_state == IEEE80211_S_AUTH || + vap->iv_state == IEEE80211_S_ASSOC || + vap->iv_state == IEEE80211_S_RUN) desc->connid = htobe32(UATH_ID_BSS); else desc->connid = htobe32(UATH_ID_INVALID); @@ -2065,7 +2066,6 @@ uath_newstate(struct ieee80211vap *vap, callout_stop(&sc->stat_ch); callout_stop(&sc->watchdog_ch); - sc->sc_state = nstate; switch (nstate) { case IEEE80211_S_INIT: Modified: user/thompsa/vaptq/sys/dev/usb/wlan/if_uathvar.h ============================================================================== --- user/thompsa/vaptq/sys/dev/usb/wlan/if_uathvar.h Fri Apr 17 03:45:15 2009 (r191190) +++ user/thompsa/vaptq/sys/dev/usb/wlan/if_uathvar.h Fri Apr 17 03:49:26 2009 (r191191) @@ -183,7 +183,6 @@ struct uath_softc { struct uath_stat sc_stat; int (*sc_newstate)(struct ieee80211com *, enum ieee80211_state, int); - enum ieee80211_state sc_state; struct usb2_xfer *sc_xfer[UATH_N_XFERS]; struct uath_cmd sc_cmd[UATH_CMD_LIST_COUNT];