gmp: Update to 4.2.2

[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 c278cf2..196ac74 100644 (file)
--- a/package/madwifi/patches/305-pureg_fix.patch
+++ b/package/madwifi/patches/305-pureg_fix.patch
@@ -1,8 +1,6 @@
-Index: madwifi-trunk-r3314/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-02-20 21:57:41.025078273 +0100
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-02-20 21:57:44.393270217 +0100
-@@ -4146,7 +4146,9 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -4149,7 +4149,9 @@

                rfilt |= HAL_RX_FILTER_PROM;
        if (ic->ic_opmode == IEEE80211_M_STA ||
            sc->sc_opmode == HAL_M_IBSS ||      /* NB: AHDEMO too */
                rfilt |= HAL_RX_FILTER_PROM;
        if (ic->ic_opmode == IEEE80211_M_STA ||
            sc->sc_opmode == HAL_M_IBSS ||      /* NB: AHDEMO too */


@@ -13,10 +11,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                rfilt |= HAL_RX_FILTER_BEACON;
        if (sc->sc_nmonvaps > 0)
                rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON |
                rfilt |= HAL_RX_FILTER_BEACON;
        if (sc->sc_nmonvaps > 0)
                rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON |

-Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c        2008-02-20 21:57:41.037078957 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_input.c     2008-02-20 21:57:44.401270672 +0100
+--- a/net80211/ieee80211_input.c
++++ b/net80211/ieee80211_input.c

 @@ -346,11 +346,12 @@
                                bssid = wh->i_addr3;
                        }
 @@ -346,11 +346,12 @@
                                bssid = wh->i_addr3;
                        }


@@ -108,10 +104,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
                /*
                 * If scanning, just pass information to the scan module.
                 */
                /*
                 * If scanning, just pass information to the scan module.
                 */

-Index: madwifi-trunk-r3314/net80211/ieee80211_node.c
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_node.c 2008-02-20 21:56:33.629237604 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_node.c      2008-02-20 21:57:44.409271127 +0100
+--- a/net80211/ieee80211_node.c
++++ b/net80211/ieee80211_node.c

 @@ -383,10 +383,16 @@
        /* Update country ie information */
        ieee80211_build_countryie(ic);
 @@ -383,10 +383,16 @@
        /* Update country ie information */
        ieee80211_build_countryie(ic);


@@ -131,10 +125,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_node.c
  
        (void) ieee80211_sta_join1(PASS_NODE(ni));
  }
  
        (void) ieee80211_sta_join1(PASS_NODE(ni));
  }

-Index: madwifi-trunk-r3314/net80211/ieee80211_proto.c
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_proto.c        2008-02-20 21:56:33.633237829 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_proto.c     2008-02-20 21:57:44.413271357 +0100
+--- a/net80211/ieee80211_proto.c
++++ b/net80211/ieee80211_proto.c

 @@ -595,6 +595,28 @@
        { 4, { 2, 4, 11, 22 } },        /* IEEE80211_MODE_TURBO_G (mixed b/g) */
  };
 @@ -595,6 +595,28 @@
        { 4, { 2, 4, 11, 22 } },        /* IEEE80211_MODE_TURBO_G (mixed b/g) */
  };


@@ -164,11 +156,9 @@ Index: madwifi-trunk-r3314/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
  /*
   * Mark the basic rates for the 11g rate table based on the
   * specified mode.  For 11b compatibility we mark only 11b

-Index: madwifi-trunk-r3314/net80211/ieee80211_var.h
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_var.h  2008-02-20 21:56:33.645238517 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_var.h       2008-02-20 21:57:44.417271583 +0100
-@@ -707,6 +707,7 @@
+--- a/net80211/ieee80211_var.h
++++ b/net80211/ieee80211_var.h
+@@ -708,6 +708,7 @@

  void ieee80211_build_sc_ie(struct ieee80211com *);
  void ieee80211_dfs_action(struct ieee80211com *);
  void ieee80211_expire_channel_excl_restrictions(struct ieee80211com *);
  void ieee80211_build_sc_ie(struct ieee80211com *);
  void ieee80211_dfs_action(struct ieee80211com *);
  void ieee80211_expire_channel_excl_restrictions(struct ieee80211com *);