Changeset 3302

Timestamp:

01/29/08 10:17:23 (1 year ago)

Author:

scottr

Message:

Ensure non-AP STA VAPs correctly notify the AP when when their power save state
changes.

Previously, a confusion between the node's power save state and the VAP's
power save state was causing all nulldata frames to be sent with 0 in the
PwrMgt? bit. This was causing the AP to not notice when the STA went off
channel to scan and hence not buffer frames.

We now update the VAP's power save state so that nulldata frames are sent with
the correct bits set. We also clean up some logic surrounding the use of XOR.

Reference changesets:
* http://madwifi.org/changeset/2330
* http://madwifi.org/changeset/2345
* http://madwifi.org/changeset/3062
* http://madwifi.org/changeset/3065

Files:

• madwifi/branches/madwifi-0.9.4/net80211/ieee80211_power.c (modified) (3 diffs)
• madwifi/branches/madwifi-0.9.4/net80211/ieee80211_scan.c (modified) (1 diff)

madwifi/branches/madwifi-0.9.4/net80211/ieee80211_power.c

@@ -339 +339 @@
-        int qlen;
-
-((enable != 0) ^ ((ni->ni_flags & IEEE80211_NODE_PWR_MGT) != 0)))
+!enable == !!IEEE80211_VAP_IS_SLEEPING(vap)) /* Bool. normalise */
-                return;
-
@@ -345 +345 @@
-                "sta power save mode %s", enable ? "on" : "off");
-        if (!enable) {
-ni->ni_flags &= ~IEEE80211_NODE_PWR_MGT
+IEEE80211_VAP_WAKEUP(vap)
-                ieee80211_send_nulldata(ieee80211_ref_node(ni));
-                /*
@@ -369 +369 @@
-                }
-        } else {
-ni->ni_flags |= IEEE80211_NODE_PWR_MGT
+IEEE80211_VAP_GOTOSLEEP(vap)
-                ieee80211_send_nulldata(ieee80211_ref_node(ni));
-        }

madwifi/branches/madwifi-0.9.4/net80211/ieee80211_scan.c

@@ -324 +324 @@
-        if (vap->iv_opmode == IEEE80211_M_STA &&
-            vap->iv_state == IEEE80211_S_RUN) {
-(vap->iv_bss->ni_flags & IEEE80211_NODE_PWR_MGT) == 0
+!IEEE80211_VAP_IS_SLEEPING(vap)
-                        /*
-                         * Initiate power save before going off-channel.