|
|
@@ -813,11 +813,10 @@
|
|
|
+ (vap->iv_opmode == IEEE80211_M_WDS)) &&
|
|
|
+ (scan.capinfo & IEEE80211_CAPINFO_ESS))) {
|
|
|
+ struct ieee80211vap *avp = NULL;
|
|
|
++ int found = 0;
|
|
|
+
|
|
|
+ IEEE80211_LOCK_IRQ(vap->iv_ic);
|
|
|
+ if (vap->iv_opmode == IEEE80211_M_HOSTAP) {
|
|
|
-+ int found = 0;
|
|
|
-+
|
|
|
+ TAILQ_FOREACH(avp, &vap->iv_wdslinks, iv_wdsnext) {
|
|
|
+ if (!memcmp(avp->wds_mac, wh->i_addr2, IEEE80211_ADDR_LEN)) {
|
|
|
+ if (avp->iv_state != IEEE80211_S_RUN)
|
|
|
@@ -826,15 +825,16 @@
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
-+ if (!found)
|
|
|
-+ break;
|
|
|
-+
|
|
|
-+ ni = ni_or_null = avp->iv_wdsnode;
|
|
|
++ if (found)
|
|
|
++ ni = ni_or_null = avp->iv_wdsnode;
|
|
|
+ } else if (vap->iv_opmode == IEEE80211_M_WDS) {
|
|
|
++ found = 1;
|
|
|
+ ni = ni_or_null = vap->iv_wdsnode;
|
|
|
+ }
|
|
|
+ IEEE80211_UNLOCK_IRQ(vap->iv_ic);
|
|
|
+
|
|
|
++ if (!found)
|
|
|
++ break;
|
|
|
+
|
|
|
if (ni_or_null == NULL) {
|
|
|
- /* Create a new entry in the neighbor table. */
|