svn commit: r191191 - user/thompsa/vaptq/sys/dev/usb/wlan
Andrew Thompson
thompsa at FreeBSD.org
Thu Apr 16 20:49:27 PDT 2009
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];
More information about the svn-src-user
mailing list