X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/bcb54b392476cc18216aa9def60424e507d5cde1..071f766b1ddbdd19a8c97ed2773e892c039a35d1:/package/madwifi/patches/312-erpupdate.patch

diff --git a/package/madwifi/patches/312-erpupdate.patch b/package/madwifi/patches/312-erpupdate.patch
index 158911bf3..f878acd8f 100644
--- a/package/madwifi/patches/312-erpupdate.patch
+++ b/package/madwifi/patches/312-erpupdate.patch
@@ -1,8 +1,6 @@
-Index: madwifi-trunk-r3314/net80211/ieee80211_beacon.c
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_beacon.c	2008-02-20 18:10:45.515108151 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_beacon.c	2008-02-20 18:10:50.491391734 +0100
-@@ -542,10 +542,10 @@
+--- a/net80211/ieee80211_beacon.c
++++ b/net80211/ieee80211_beacon.c
+@@ -542,10 +542,10 @@ ieee80211_beacon_update(struct ieee80211
  			vap->iv_flags &= ~IEEE80211_F_XRUPDATE;
  		}
  #endif
@@ -15,11 +13,9 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_beacon.c
  		}
  	}
  	/* if it is a mode change beacon for dynamic turbo case */
-Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c	2008-02-20 18:10:49.723347963 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_input.c	2008-02-20 18:10:50.495391960 +0100
-@@ -3431,9 +3431,12 @@
+--- a/net80211/ieee80211_input.c
++++ b/net80211/ieee80211_input.c
+@@ -3431,9 +3431,12 @@ ieee80211_recv_mgmt(struct ieee80211vap
  			/* Assume no ERP IE == 11b AP */
  			if ((!has_erp || (has_erp && (scan.erp & IEEE80211_ERP_NON_ERP_PRESENT))) &&
  				!(ic->ic_flags & IEEE80211_F_USEPROT)) {
@@ -33,11 +29,9 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
  			}
  		}
  
-Index: madwifi-trunk-r3314/net80211/ieee80211_node.c
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_node.c	2008-02-20 18:10:49.727348192 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_node.c	2008-02-20 18:10:50.507392644 +0100
-@@ -2022,8 +2022,12 @@
+--- a/net80211/ieee80211_node.c
++++ b/net80211/ieee80211_node.c
+@@ -2025,8 +2025,12 @@ ieee80211_node_join_11g(struct ieee80211
  		}
  
  		/* Update ERP element if this is first non ERP station */
@@ -52,7 +46,7 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_node.c
  	} else
  		ni->ni_flags |= IEEE80211_NODE_ERP;
  }
-@@ -2226,6 +2230,8 @@
+@@ -2229,6 +2233,8 @@ ieee80211_node_leave_11g(struct ieee8021
  		IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC, ni,
  			"non-ERP station leaves, count now %d", ic->ic_nonerpsta);
  		if (ic->ic_nonerpsta == 0) {
@@ -61,7 +55,7 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_node.c
  			IEEE80211_DPRINTF(vap, IEEE80211_MSG_ASSOC,
  				"%s: disable use of protection\n", __func__);
  			ic->ic_flags &= ~IEEE80211_F_USEPROT;
-@@ -2237,7 +2243,9 @@
+@@ -2240,7 +2246,9 @@ ieee80211_node_leave_11g(struct ieee8021
  				ic->ic_flags |= IEEE80211_F_SHPREAMBLE;
  				ic->ic_flags &= ~IEEE80211_F_USEBARKER;
  			}