X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c0c6a90c76dd4d98aa44e5b1b358dd87b145516e..93d042b356e1ef6f9a4afc71f8ba5233c530b1b9:/package/madwifi/patches/441-fix_ibss_node_handling.patch

diff --git a/package/madwifi/patches/441-fix_ibss_node_handling.patch b/package/madwifi/patches/441-fix_ibss_node_handling.patch
index 13f15fb72..b12cf6797 100644
--- a/package/madwifi/patches/441-fix_ibss_node_handling.patch
+++ b/package/madwifi/patches/441-fix_ibss_node_handling.patch
@@ -1,6 +1,6 @@
 --- a/ath/if_ath.c
 +++ b/ath/if_ath.c
-@@ -6642,10 +6642,8 @@ static void
+@@ -6641,10 +6641,8 @@ static void
  ath_recv_mgmt(struct ieee80211vap * vap, struct ieee80211_node *ni_or_null,
  	struct sk_buff *skb, int subtype, int rssi, u_int64_t rtsf)
  {
@@ -12,7 +12,7 @@
  	struct ieee80211_node * ni = ni_or_null;
  	u_int64_t hw_tsf, beacon_tsf;
  	u_int32_t hw_tu, beacon_tu, intval;
-@@ -6687,7 +6685,7 @@ ath_recv_mgmt(struct ieee80211vap * vap,
+@@ -6686,7 +6684,7 @@ ath_recv_mgmt(struct ieee80211vap * vap,
  		}
  		if ((vap->iv_opmode == IEEE80211_M_IBSS) &&
  				(sc->sc_opmode == HAL_M_HOSTAP) &&
@@ -44,7 +44,7 @@
  			if (dir != IEEE80211_FC1_DIR_NODS) {
  				IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY,
  					wh, "data", "invalid dir 0x%x", dir);
-@@ -3548,6 +3553,11 @@ ieee80211_recv_mgmt(struct ieee80211vap 
+@@ -3556,6 +3561,11 @@ ieee80211_recv_mgmt(struct ieee80211vap 
  			} else if (vap->iv_opmode == IEEE80211_M_WDS) {
  				found = 1;
  				ni = ni_or_null = vap->iv_wdsnode;
@@ -56,7 +56,7 @@
  			}
  			IEEE80211_UNLOCK_IRQ(vap->iv_ic);
  
-@@ -3672,19 +3682,8 @@ ieee80211_recv_mgmt(struct ieee80211vap 
+@@ -3684,19 +3694,8 @@ ieee80211_recv_mgmt(struct ieee80211vap 
  			vap->iv_stats.is_rx_ssidmismatch++; /*XXX*/
  			return;
  		}
@@ -78,3 +78,14 @@
  			if (ni == NULL)
  				return;
  			allocbs = 1;
+--- a/net80211/ieee80211_node.c
++++ b/net80211/ieee80211_node.c
+@@ -601,6 +601,8 @@ ieee80211_ibss_merge(struct ieee80211_no
+ 		ic->ic_flags & IEEE80211_F_SHPREAMBLE ? "short" : "long",
+ 		ic->ic_flags & IEEE80211_F_SHSLOT ? "short" : "long",
+ 		ic->ic_flags & IEEE80211_F_USEPROT ? ", protection" : "");
++	if (!IEEE80211_ADDR_EQ(ni->ni_bssid, vap->iv_bssid))
++		ieee80211_node_table_reset(&vap->iv_ic->ic_sta, vap);
+ 	return ieee80211_sta_join1(ieee80211_ref_node(ni));
+ }
+ EXPORT_SYMBOL(ieee80211_ibss_merge);