brcm47xx: update bcma and ssb to master-2011-07-21

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

diff --git a/package/madwifi/patches/348-ackcts.patch b/package/madwifi/patches/348-ackcts.patch
index 7fe85a8..42b6fe2 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      2008-04-23 06:50:24.000000000 +0200
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-04-23 06:54:03.000000000 +0200
-@@ -2721,6 +2721,9 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -2723,6 +2723,9 @@ ar_device(int devid)

  static int
  ath_set_ack_bitrate(struct ath_softc *sc, int high)
  {
  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 */
        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 */

-@@ -10782,8 +10785,13 @@
+@@ -10791,8 +10794,13 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl

                                break;
  #endif
                        case ATH_ACKRATE:
                                break;
  #endif
                        case ATH_ACKRATE:


@@ -28,11 +26,9 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                                break;
                        case ATH_RP:
                                ath_rp_record(sc,
                                break;
                        case ATH_RP:
                                ath_rp_record(sc,

-Index: madwifi-trunk-r3314/ath/if_athvar.h
-===================================================================
---- madwifi-trunk-r3314.orig/ath/if_athvar.h   2008-04-23 05:41:40.000000000 +0200
-+++ madwifi-trunk-r3314/ath/if_athvar.h        2008-04-23 06:53:03.000000000 +0200
-@@ -681,6 +681,7 @@
+--- a/ath/if_athvar.h
++++ b/ath/if_athvar.h
+@@ -681,6 +681,7 @@ struct ath_softc {

        unsigned int    sc_devstopped:1;        /* stopped due to of no tx bufs */
        unsigned int    sc_stagbeacons:1;       /* use staggered beacons */
        unsigned int    sc_dfswait:1;           /* waiting on channel for radar detect */
        unsigned int    sc_devstopped:1;        /* stopped due to of no tx bufs */
        unsigned int    sc_stagbeacons:1;       /* use staggered beacons */
        unsigned int    sc_dfswait:1;           /* waiting on channel for radar detect */