Ticket #969: madwifi-domlme-revised.patch

net80211/ieee80211_node.c

@@ -1662 +1662 @@
-void
-ieee80211_iterate_nodes(struct ieee80211_node_table *nt, ieee80211_iter_func *f, void *arg)
-{
+        ieee80211_iterate_dev_nodes(NULL, nt, f, arg);
+}
+EXPORT_SYMBOL(ieee80211_iterate_nodes);
+
+void
+ieee80211_iterate_dev_nodes(struct net_device *dev, struct ieee80211_node_table *nt, ieee80211_iter_func *f, void *arg)
+{
-        struct ieee80211_node *ni;
-        u_int gen;
-
@@ -1670 +1677 @@
-restart:
-        IEEE80211_NODE_LOCK(nt);
-        TAILQ_FOREACH(ni, &nt->nt_node, ni_list) {
+                if (dev != NULL && ni->ni_vap->iv_dev != dev) 
+                        continue;  /* skip node not for this vap */
-                if (ni->ni_scangen != gen) {
-                        ni->ni_scangen = gen;
-                        (void) ieee80211_ref_node(ni);
@@ -1683 +1692 @@
-
-        IEEE80211_SCAN_UNLOCK_IRQ(nt);
-}
-
+dev_
-
-void
-ieee80211_dump_node(struct ieee80211_node_table *nt, struct ieee80211_node *ni)

net80211/ieee80211_node.h

@@ -298 +298 @@
-typedef void ieee80211_iter_func(void *, struct ieee80211_node *);
-void ieee80211_iterate_nodes(struct ieee80211_node_table *,
-        ieee80211_iter_func *, void *);
+void ieee80211_iterate_dev_nodes(struct net_device *, 
+        struct ieee80211_node_table *, ieee80211_iter_func *, void *);
-
-void    ieee80211_dump_node(struct ieee80211_node_table *,
-        struct ieee80211_node *);

net80211/ieee80211_wireless.c

@@ -3330 +3330 @@
-                                        mlme->im_macaddr);
-                                if (ni == NULL)
-                                        return -EINVAL;
-
+
+
-                                ieee80211_free_node(ni);
-                        } else
-nodes(
+dev_nodes(dev, 
-                        break;
-                default:
-                        return -EINVAL;