Changeset 2711 for branches/madwifi-ng-txpower/net80211/ieee80211_node.c

Timestamp:

09/17/07 18:34:10 (5 years ago)

Author:

mentor

Message:

The aforementioned patch. It currently does no work, and I can no longer remember where I was going with it. I think I needed to add some logic for fiddling TX power on channel change at least.

Files:

• branches/madwifi-ng-txpower/net80211/ieee80211_node.c (modified) (4 diffs)

branches/madwifi-ng-txpower/net80211/ieee80211_node.c

@@ -586 +586 @@
-                ieee80211_unref_node(&obss);
-        ic->ic_bsschan = selbs->ni_chan;
-c->ic_curchan = ic->ic_bsschan
+eee80211_set_channel(ic, selbs->ni_chan)
-        ic->ic_curmode = ieee80211_chan2mode(ic->ic_curchan);
-        ic->ic_set_channel(ic);
@@ -915 +915 @@
-                ni->ni_chan = IEEE80211_CHAN_ANYC;
-                ni->ni_authmode = IEEE80211_AUTH_OPEN;
-                ni->ni_txpower = ic->ic_txpowlimit;
-
-                ieee80211_crypto_resetkey(vap, &ni->ni_ucastkey,
@@ -1435 +1434 @@
-                 * Free fragment if not needed anymore
-                 * (last fragment older than 1s).
- d
+: D
-                 */
-ni->ni_rxfrag != NULL
-jiffies > ni->ni_rxfragstamp + HZ
+(ni->ni_rxfrag != NULL)
+(jiffies > ni->ni_rxfragstamp + HZ)
-                        dev_kfree_skb(ni->ni_rxfrag);
-                        ni->ni_rxfrag = NULL;
@@ -1446 +1445 @@
-                 * of time and regardless reclaiming our state is wrong.
-                 */
+                ni->ni_inact--;
-                if (ni == ni->ni_vap->iv_bss) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-                                /*
-
-
-
-
-
+
-                                 */
+                                if (ieee80211_node_saveq_age(ni) &&
+                                                !IEEE80211_NODE_SAVEQ_QLEN(ni) &&
+                                                (vap->iv_set_tim != NULL))
+                                        vap->iv_set_tim(ni, 0);
+                                
+                                /* Probe the station before time it out.  We
+                                 * send a null data frame which may not be
+                                 * universally supported by drivers (need it
+                                 * for ps-poll support so it should be...). */
+                                if ((0 < ni->ni_inact) &&
+                                                (ni->ni_inact <= vap->iv_inact_probe)) {
+                                        IEEE80211_NOTE(vap,
+                                                        IEEE80211_MSG_INACT | IEEE80211_MSG_NODE,
+                                                        ni, "%s",
+                                                        "probe station due to inactivity");
+                                        /*
+                                         * Grab a reference before unlocking the table
+                                         * so the node cannot be reclaimed before we
+                                         * send the frame. ieee80211_send_nulldata
+                                         * understands we've done this and reclaims the
+                                         * ref. for us as needed.
+                                         */
+                                        ieee80211_ref_node(ni);
+                                        IEEE80211_NODE_TABLE_UNLOCK_IRQ_EARLY(nt);
+
+                                        ieee80211_send_nulldata(PASS_NODE(ni));
+
+                                        /* XXX stat? */
+                                        goto restart;
+                                }
+                        }
+
+                        if (ni->ni_inact <= 0) {
+                                IEEE80211_NOTE(ni->ni_vap,
+                                                IEEE80211_MSG_INACT | IEEE80211_MSG_NODE, ni,
+                                                "station timed out due to inactivity (refcnt %u)",
+                                                ieee80211_node_refcnt(ni));
+                                /*
+                                 * Send a deauthenticate frame and drop the station.
+                                 * We grab a reference before unlocking the table so
+                                 * the node cannot be reclaimed before we complete our
+                                 * work.
+                                 *
+                                 * Separately we must drop the node lock before sending
+                                 * in case the driver takes a lock, as this may result
+                                 * in a LOR between the node lock and the driver lock.
+                                 */
+                                ni->ni_vap->iv_stats.is_node_timeout++;
-                                ieee80211_ref_node(ni);
-                                IEEE80211_NODE_TABLE_UNLOCK_IRQ_EARLY(nt);
-
-
+
+
+
+
+
+
+
+
-                                goto restart;
-                        }
-                }
-                if (ni->ni_inact <= 0) {
-                        IEEE80211_NOTE(ni->ni_vap,
-                                IEEE80211_MSG_INACT | IEEE80211_MSG_NODE, ni,
-                                "station timed out due to inactivity (refcnt %u)",
-                                ieee80211_node_refcnt(ni));
-                        /*
-                         * Send a deauthenticate frame and drop the station.
-                         * We grab a reference before unlocking the table so
-                         * the node cannot be reclaimed before we complete our
-                         * work.
-                         *
-                         * Separately we must drop the node lock before sending
-                         * in case the driver takes a lock, as this may result
-                         * in a LOR between the node lock and the driver lock.
-                         */
-                        ni->ni_vap->iv_stats.is_node_timeout++;
-                        ieee80211_ref_node(ni);
-                        IEEE80211_NODE_TABLE_UNLOCK_IRQ_EARLY(nt);
-                        if (ni->ni_associd != 0) {
-                                IEEE80211_SEND_MGMT(ni,
-                                        IEEE80211_FC0_SUBTYPE_DEAUTH,
-                                        IEEE80211_REASON_AUTH_EXPIRE);
-                        }
-                        ieee80211_node_leave(ni);
-                        ieee80211_unref_node(&ni);
-                        goto restart;
-                }
-        }