PERFORCE change 67857 for review
Sam Leffler
sam at FreeBSD.org
Wed Dec 29 11:55:28 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=67857
Change 67857 by sam at sam_ebb on 2004/12/29 19:55:08
don't setup the station table if it's already there; this
can happen when an ibss merge takes place
Affected files ...
.. //depot/projects/wifi/sys/net80211/ieee80211_node.c#30 edit
Differences ...
==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#30 (text+ko) ====
@@ -759,17 +759,20 @@
return 0;
}
/*
- * Create the neighbor table.
+ * Create the neighbor table; it will already
+ * exist if we are simply switching mastership.
*/
- ic->ic_sta = ieee80211_node_table_alloc(ic,
+ if (ic->ic_sta == NULL) {
+ ic->ic_sta = ieee80211_node_table_alloc(ic,
"neighbor", ic->ic_inact_run,
ieee80211_timeout_stations);
- if (ic->ic_sta == NULL) {
- /*
- * Should remain in SCAN state and retry.
- */
- /* XXX stat+msg */
- return 0;
+ if (ic->ic_sta == NULL) {
+ /*
+ * Should remain in SCAN state and retry.
+ */
+ /* XXX stat+msg */
+ return 0;
+ }
}
}
More information about the p4-projects
mailing list