Author: adrian
Date: Sun May 3 23:27:36 2015
New Revision: 282391
URL: https://svnweb.freebsd.org/changeset/base/282391
Log:
Add comment about AUTH -> AUTH state transition + fix some style issues.
PR: kern/197143
Submitted by: Andriy Voskoboinyk <s3er...@gmail.com>
Modified:
head/sys/dev/wpi/if_wpi.c
Modified: head/sys/dev/wpi/if_wpi.c
==============================================================================
--- head/sys/dev/wpi/if_wpi.c Sun May 3 23:25:33 2015 (r282390)
+++ head/sys/dev/wpi/if_wpi.c Sun May 3 23:27:36 2015 (r282391)
@@ -1703,6 +1703,11 @@ wpi_newstate(struct ieee80211vap *vap, e
/* FALLTHROUGH */
case IEEE80211_S_AUTH:
/*
+ * NB: do not optimize AUTH -> AUTH state transmission -
+ * this will break powersave with non-QoS AP!
+ */
+
+ /*
* The node must be registered in the firmware before auth.
* Also the associd must be cleared on RUN -> ASSOC
* transitions.
@@ -2609,7 +2614,7 @@ wpi_tx_data(struct wpi_softc *sc, struct
/* Select EDCA Access Category and TX ring for this frame. */
if (IEEE80211_QOS_HAS_SEQ(wh)) {
- qos = ((const struct ieee80211_qosframe *)wh)->i_qos[0];
+ qos = ((const struct ieee80211_qosframe *)wh)->i_qos[0];
tid = qos & IEEE80211_QOS_TID;
} else {
qos = 0;
@@ -3764,7 +3769,6 @@ wpi_config(struct wpi_softc *sc)
sc->rxon.filter |= WPI_FILTER_ASSOC | WPI_FILTER_PROMISC;
break;
case IEEE80211_M_AHDEMO:
- /* XXX workaround for passive channels selection */
sc->rxon.mode = WPI_MODE_HOSTAP;
break;
case IEEE80211_M_MONITOR:
@@ -4664,7 +4668,7 @@ wpi_post_alive(struct wpi_softc *sc)
/* NB: Runtime firmware must be up and running. */
if (!(wpi_prph_read(sc, WPI_APMG_RFKILL) & 1)) {
- device_printf(sc->sc_dev,
+ device_printf(sc->sc_dev,
"RF switch: radio disabled (%s)\n", __func__);
wpi_nic_unlock(sc);
return EPERM; /* :-) */
@@ -4988,7 +4992,7 @@ wpi_apm_stop_master(struct wpi_softc *sc
/* Stop busmaster DMA activity. */
WPI_SETBITS(sc, WPI_RESET, WPI_RESET_STOP_MASTER);
-
+
if ((WPI_READ(sc, WPI_GP_CNTRL) & WPI_GP_CNTRL_PS_MASK) ==
WPI_GP_CNTRL_MAC_PS)
return; /* Already asleep. */
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
