refreshed madwifi patches

[openwrt.git] / package / madwifi / patches / 305-pureg_fix.patch

diff --git a/package/madwifi/patches/305-pureg_fix.patch b/package/madwifi/patches/305-pureg_fix.patch
index c3542831c1b439a6c2feb1f2e5fca98dc4c02291..df9b3e7de30926623d7a0447f24130f886884d4c 100644 (file)
--- a/package/madwifi/patches/305-pureg_fix.patch
+++ b/package/madwifi/patches/305-pureg_fix.patch
@@ -1,8 +1,8 @@
-Index: madwifi-ng-r2525-20070630/ath/if_ath.c
+Index: madwifi-ng-r2568-20070710/ath/if_ath.c
 ===================================================================
---- madwifi-ng-r2525-20070630.orig/ath/if_ath.c        2007-07-03 23:02:33.302125000 +0200
-+++ madwifi-ng-r2525-20070630/ath/if_ath.c     2007-07-03 23:02:33.594143250 +0200
-@@ -3392,7 +3392,9 @@
+--- madwifi-ng-r2568-20070710.orig/ath/if_ath.c        2007-10-20 20:52:09.000000000 +0200
++++ madwifi-ng-r2568-20070710/ath/if_ath.c     2007-10-20 20:52:37.000000000 +0200
+@@ -3387,7 +3387,9 @@
                rfilt |= HAL_RX_FILTER_PROM;
        if (ic->ic_opmode == IEEE80211_M_STA ||
            sc->sc_opmode == HAL_M_IBSS ||      /* NB: AHDEMO too */
@@ -13,10 +13,10 @@ Index: madwifi-ng-r2525-20070630/ath/if_ath.c
                rfilt |= HAL_RX_FILTER_BEACON;
        if ((sc->sc_nmonvaps > 0) || ((sc->sc_nvaps > 0) && (sc->sc_nibssvaps > 0)))
                rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON |
-Index: madwifi-ng-r2525-20070630/net80211/ieee80211_input.c
+Index: madwifi-ng-r2568-20070710/net80211/ieee80211_input.c
 ===================================================================
---- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_input.c  2007-07-03 23:02:33.002106250 +0200
-+++ madwifi-ng-r2525-20070630/net80211/ieee80211_input.c       2007-07-03 23:02:33.598143500 +0200
+--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_input.c  2007-10-20 20:52:09.000000000 +0200
++++ madwifi-ng-r2568-20070710/net80211/ieee80211_input.c       2007-10-20 20:52:34.000000000 +0200
 @@ -321,11 +321,12 @@
                                bssid = wh->i_addr3;
                        }
@@ -97,10 +97,10 @@ Index: madwifi-ng-r2525-20070630/net80211/ieee80211_input.c
                /*
                 * If scanning, just pass information to the scan module.
                 */
-Index: madwifi-ng-r2525-20070630/net80211/ieee80211_node.c
+Index: madwifi-ng-r2568-20070710/net80211/ieee80211_node.c
 ===================================================================
---- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_node.c   2007-07-03 23:02:31.037983500 +0200
-+++ madwifi-ng-r2525-20070630/net80211/ieee80211_node.c        2007-07-03 23:02:33.598143500 +0200
+--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_node.c   2007-10-20 20:52:09.000000000 +0200
++++ madwifi-ng-r2568-20070710/net80211/ieee80211_node.c        2007-10-20 20:52:34.000000000 +0200
 @@ -332,10 +332,16 @@
        /* Update country ie information */
        ieee80211_build_countryie(ic);
@@ -120,10 +120,10 @@ Index: madwifi-ng-r2525-20070630/net80211/ieee80211_node.c
  
        (void) ieee80211_sta_join1(PASS_NODE(ni));
  }
-Index: madwifi-ng-r2525-20070630/net80211/ieee80211_proto.c
+Index: madwifi-ng-r2568-20070710/net80211/ieee80211_proto.c
 ===================================================================
---- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_proto.c  2007-07-03 23:02:32.306062750 +0200
-+++ madwifi-ng-r2525-20070630/net80211/ieee80211_proto.c       2007-07-03 23:02:33.630145500 +0200
+--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_proto.c  2007-10-20 20:52:09.000000000 +0200
++++ madwifi-ng-r2568-20070710/net80211/ieee80211_proto.c       2007-10-20 20:52:09.000000000 +0200
 @@ -586,6 +586,28 @@
        { 4, { 2, 4, 11, 22 } },        /* IEEE80211_MODE_TURBO_G (mixed b/g) */
  };
@@ -153,10 +153,10 @@ Index: madwifi-ng-r2525-20070630/net80211/ieee80211_proto.c
  /*
   * Mark the basic rates for the 11g rate table based on the
   * specified mode.  For 11b compatibility we mark only 11b
-Index: madwifi-ng-r2525-20070630/net80211/ieee80211_var.h
+Index: madwifi-ng-r2568-20070710/net80211/ieee80211_var.h
 ===================================================================
---- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_var.h    2007-07-03 23:02:32.330064250 +0200
-+++ madwifi-ng-r2525-20070630/net80211/ieee80211_var.h 2007-07-03 23:02:33.678148500 +0200
+--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_var.h    2007-10-20 20:52:09.000000000 +0200
++++ madwifi-ng-r2568-20070710/net80211/ieee80211_var.h 2007-10-20 20:52:09.000000000 +0200
 @@ -592,6 +592,8 @@
  void ieee80211_build_countryie(struct ieee80211com *);
  int ieee80211_media_setup(struct ieee80211com *, struct ifmedia *, u_int32_t,