Ticket #1404: patch-txdrop1sec.diff

madwifi-0.9.3/net80211/ieee80211_linux.c

@@ -193 +193 @@
-        union iwreq_data wreq;
-
-        if (ni == vap->iv_bss) { 
-
+
+
+
+
+
+
+
+
+
+
+
-                        netif_carrier_on(dev);
+                } else
+                        IEEE80211_DPRINTF(vap, IEEE80211_MSG_ASSOC,
+                                "%s: bssid %s newassoc=0  %lu\n",
+                                __func__, ether_sprintf(ni->ni_bssid), jiffies);
-                memset(&wreq, 0, sizeof(wreq));
-                IEEE80211_ADDR_COPY(wreq.addr.sa_data, ni->ni_bssid);
-                wreq.addr.sa_family = ARPHRD_ETHER;
@@ -216 +230 @@
-}
-
-void
+ieee80211_notify_node_leave_delayed(unsigned long data)
+{
+        struct ieee80211vap *vap = (struct ieee80211vap *)data;
+        struct net_device *dev = vap->iv_dev;
+        union iwreq_data wreq;
+
+        IEEE80211_DPRINTF(vap, IEEE80211_MSG_ASSOC,
+                "%s: netif_carrier_off(%p) state 0x%lx  %lu\n",
+                __func__, dev, dev->state, jiffies);
+        netif_carrier_off(dev);
+        memset(wreq.ap_addr.sa_data, 0, ETHER_ADDR_LEN);
+        wreq.ap_addr.sa_family = ARPHRD_ETHER;
+        wireless_send_event(dev, SIOCGIWAP, &wreq, NULL);
+}
+
+void
-ieee80211_notify_node_leave(struct ieee80211_node *ni)
-{
-        struct ieee80211vap *vap = ni->ni_vap;
@@ -223 +253 @@
-        union iwreq_data wreq;
-
-        if (ni == vap->iv_bss) {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        } else {
-                /* fire off wireless event station leaving */
-                memset(&wreq, 0, sizeof(wreq));

madwifi-0.9.3/net80211/ieee80211_node.c

@@ -120 +120 @@
-        vap->iv_inact_auth = IEEE80211_INACT_AUTH;
-        vap->iv_inact_run = IEEE80211_INACT_RUN;
-        vap->iv_inact_probe = IEEE80211_INACT_PROBE;
+        /* delayed notify about station leave old ap before roam to new */
+        init_timer(&vap->iv_leavedelay);
+        vap->iv_leavedelay.function = ieee80211_notify_node_leave_delayed;
+        vap->iv_leavedelay.data = (unsigned long)vap;
-}
-
-void
@@ -192 +196 @@
-{
-        struct ieee80211com *ic = vap->iv_ic;
-
+        del_timer(&vap->iv_leavedelay);
-        ieee80211_node_table_reset(&ic->ic_sta, vap);
-        if (vap->iv_bss != NULL) {
-                ieee80211_free_node(vap->iv_bss);

madwifi-0.9.3/net80211/ieee80211_proto.h

@@ -295 +295 @@
- */
-void ieee80211_notify_node_join(struct ieee80211_node *, int);
-void ieee80211_notify_node_leave(struct ieee80211_node *);
+void ieee80211_notify_node_leave_delayed(unsigned long data);
-void ieee80211_notify_scan_done(struct ieee80211vap *);
-void ieee80211_notify_sta_stats(struct ieee80211_node *ni);
-

madwifi-0.9.3/net80211/ieee80211_var.h

@@ -405 +405 @@
-        struct ieee80211_app_ie_t app_ie[IEEE80211_APPIE_NUM_OF_FRAME]; /* app-specified IEs by frame type */
-        u_int32_t app_filter;                   /* filters which management frames are forwarded to app */
-
+        struct timer_list iv_leavedelay;        /* delay notify station leave old ap on roam */
-};
-MALLOC_DECLARE(M_80211_VAP);
-