sync 8.09 with changes from trunk

[openwrt/svn-archive/archive.git] / package / madwifi / patches / 348-ackcts.patch

diff --git a/package/madwifi/patches/348-ackcts.patch b/package/madwifi/patches/348-ackcts.patch
index 65db2a058b6ea104e239fbc2593a575bca953672..5dd23fefb5ef14e826fcd5cd9aa637a9a43191a2 100644 (file)
--- a/package/madwifi/patches/348-ackcts.patch
+++ b/package/madwifi/patches/348-ackcts.patch
@@ -1,8 +1,6 @@
-Index: madwifi-trunk-r3314/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c
-+++ madwifi-trunk-r3314/ath/if_ath.c
-@@ -2721,6 +2721,9 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -2723,6 +2723,9 @@
  static int
  ath_set_ack_bitrate(struct ath_softc *sc, int high)
  {
@@ -12,7 +10,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        if (ar_device(sc->devid) == 5212 || ar_device(sc->devid) == 5213) {
                /* set ack to be sent at low bit-rate */
                /* registers taken from the OpenBSD 5212 HAL */
-@@ -10780,8 +10783,13 @@
+@@ -10789,8 +10792,13 @@
                                break;
  #endif
                        case ATH_ACKRATE:
@@ -28,10 +26,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                                break;
                        case ATH_RP:
                                ath_rp_record(sc,
-Index: madwifi-trunk-r3314/ath/if_athvar.h
-===================================================================
---- madwifi-trunk-r3314.orig/ath/if_athvar.h
-+++ madwifi-trunk-r3314/ath/if_athvar.h
+--- a/ath/if_athvar.h
++++ b/ath/if_athvar.h
 @@ -681,6 +681,7 @@
        unsigned int    sc_devstopped:1;        /* stopped due to of no tx bufs */
        unsigned int    sc_stagbeacons:1;       /* use staggered beacons */