merge r13025-13029 to 8.09

[openwrt/svn-archive/archive.git] / package / madwifi / patches / 450-new_hal.patch

diff --git a/package/madwifi/patches/450-new_hal.patch b/package/madwifi/patches/450-new_hal.patch
index 60a7dc33e8901302d66d5c252d05ca673cf09cc2..8b6094e45e9b4b8d0655d83e57cf4e0559312e14 100644 (file)
--- a/package/madwifi/patches/450-new_hal.patch
+++ b/package/madwifi/patches/450-new_hal.patch
@@ -1,6 +1,6 @@
 --- a/ath_hal/ah_os.h
 +++ b/ath_hal/ah_os.h
-@@ -156,80 +156,23 @@
+@@ -156,80 +156,23 @@ extern u_int32_t __ahdecl ath_hal_getupt
  #endif
  #endif                                /* AH_BYTE_ORDER */
  
@@ -93,7 +93,7 @@
   * The functions in this section are not intended to be invoked by MadWifi
 --- a/ath/if_ath.c
 +++ b/ath/if_ath.c
-@@ -593,6 +593,14 @@
+@@ -605,6 +605,14 @@ ath_attach(u_int16_t devid, struct net_d
        }
        sc->sc_ah = ah;
  
@@ -108,7 +108,7 @@
        /*
         * Check if the MAC has multi-rate retry support.
         * We do this by trying to setup a fake extended
-@@ -7453,7 +7461,7 @@
+@@ -7488,7 +7496,7 @@ ath_txq_setup(struct ath_softc *sc, int 
        if (qtype == HAL_TX_QUEUE_UAPSD)
                qi.tqi_qflags = HAL_TXQ_TXDESCINT_ENABLE;
        else
@@ -119,7 +119,7 @@
        if (qnum == -1) {
 --- a/ath_hal/ah_os.c
 +++ b/ath_hal/ah_os.c
-@@ -126,6 +126,13 @@
+@@ -126,6 +126,13 @@ ath_hal_printf(struct ath_hal *ah, const
  }
  EXPORT_SYMBOL(ath_hal_printf);