Remove the disabling of sound support for ixp4xx-2.6 compared to generic-2.6

[openwrt.git] / package / madwifi / patches / 120-soc_fix.patch

diff --git a/package/madwifi/patches/120-soc_fix.patch b/package/madwifi/patches/120-soc_fix.patch
index 4c37a9c..d4a9a68 100644 (file)
--- a/package/madwifi/patches/120-soc_fix.patch
+++ b/package/madwifi/patches/120-soc_fix.patch
@@ -1,6 +1,6 @@
-diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath_ahb.c madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath_ahb.c
---- madwifi-ng-refcount-r2313-20070505.old/ath/if_ath_ahb.c    2007-03-08 20:59:06.000000000 +0100
-+++ madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath_ahb.c    2007-05-13 18:17:56.367999800 +0200
+diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath_ahb.c madwifi-ng-r2377-20070526.dev/ath/if_ath_ahb.c
+--- madwifi-ng-r2377-20070526.old/ath/if_ath_ahb.c     2007-02-24 02:33:54.000000000 +0100
++++ madwifi-ng-r2377-20070526.dev/ath/if_ath_ahb.c     2007-05-26 18:51:09.112702200 +0200

 @@ -274,12 +274,12 @@
  }
  
 @@ -274,12 +274,12 @@
  }
  


@@ -68,52 +68,10 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath_ahb.c madwifi-ng-ref
                        return ret;
                break;
        default:
                        return ret;
                break;
        default:

-diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath.c
---- madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c        2007-05-13 18:17:56.362000712 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath.c        2007-05-13 18:17:56.371999192 +0200
-@@ -2490,6 +2490,7 @@
-               DPRINTF(sc,ATH_DEBUG_XMIT,                              \
-                       "%s: discard, no xmit buf\n", __func__);        \
-               sc->sc_stats.ast_tx_nobuf++;                            \
-+              goto hardstart_fail;                                    \
-       }
- 
- /*
-@@ -2676,14 +2677,13 @@
-               else if (an->an_tx_ffbuf[skb->priority]) {
-                       DPRINTF(sc, ATH_DEBUG_XMIT | ATH_DEBUG_FF,
-                               "%s: Out-Of-Order fast-frame\n", __func__);
--                      ATH_TXQ_UNLOCK(txq);
-+                      ATH_TXQ_UNLOCK_BH(txq);
-               } else
--                      ATH_TXQ_UNLOCK(txq);
-+                      ATH_TXQ_UNLOCK_BH(txq);
- 
-       ff_flushdone:
-               ATH_HARDSTART_GET_TX_BUF_WITH_LOCK;
--              if (bf == NULL)
--                      goto hardstart_fail;
-+              ATH_HARDSTART_REL_TX_BUF_WITH_TXQLOCK_OFF;
-       }
- 
- ff_bypass:
-@@ -5668,6 +5668,7 @@
-                               sc->sc_stats.ast_rx_phyerr++;
-                               phyerr = ds->ds_rxstat.rs_phyerr & 0x1f;
-                               sc->sc_stats.ast_rx_phy[phyerr]++;
-+                              goto rx_next;
-                       }
-                       if (ds->ds_rxstat.rs_status & HAL_RXERR_DECRYPT) {
-                               /*
-@@ -7662,6 +7663,7 @@
- ath_draintxq(struct ath_softc *sc)
- {
-       struct ath_hal *ah = sc->sc_ah;
-+      int npend = 0;
-       unsigned int i;
- 
-       /* XXX return value */
-@@ -7670,9 +7672,24 @@
+diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.dev/ath/if_ath.c
+--- madwifi-ng-r2377-20070526.old/ath/if_ath.c 2007-05-26 18:51:09.019716336 +0200
++++ madwifi-ng-r2377-20070526.dev/ath/if_ath.c 2007-05-26 18:51:09.116701592 +0200
+@@ -7636,9 +7636,24 @@

                DPRINTF(sc, ATH_DEBUG_RESET, "%s: beacon queue 0x%x\n",
                        __func__, ath_hal_gettxbuf(ah, sc->sc_bhalq));
                for (i = 0; i < HAL_NUM_TX_QUEUES; i++)
                DPRINTF(sc, ATH_DEBUG_RESET, "%s: beacon queue 0x%x\n",
                        __func__, ath_hal_gettxbuf(ah, sc->sc_bhalq));
                for (i = 0; i < HAL_NUM_TX_QUEUES; i++)


@@ -125,7 +83,7 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c madwifi-ng-refcoun
 +                               * Double check the hal tx pending count */
 +                              npend += ath_hal_numtxpending(ah, sc->sc_txq[i].axq_qnum);
 +                      }
 +                               * Double check the hal tx pending count */
 +                              npend += ath_hal_numtxpending(ah, sc->sc_txq[i].axq_qnum);
 +                      }

-+      }
+       }

 +      
 +      if (npend) {
 +              HAL_STATUS status;
 +      
 +      if (npend) {
 +              HAL_STATUS status;


@@ -134,7 +92,7 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c madwifi-ng-refcoun
 +              DPRINTF(sc, ATH_DEBUG_RESET, "%s: Unable to stop TxDMA. Reset HAL!\n", __func__);
 +              if (!ath_hal_reset(ah, sc->sc_ic.ic_opmode, &sc->sc_curchan, AH_TRUE, &status))
 +                      printk("%s: unable to reset hardware; hal status %u\n", __func__, status);
 +              DPRINTF(sc, ATH_DEBUG_RESET, "%s: Unable to stop TxDMA. Reset HAL!\n", __func__);
 +              if (!ath_hal_reset(ah, sc->sc_ic.ic_opmode, &sc->sc_curchan, AH_TRUE, &status))
 +                      printk("%s: unable to reset hardware; hal status %u\n", __func__, status);

-       }
++      }

 +
        sc->sc_dev->trans_start = jiffies;
        netif_start_queue(sc->sc_dev);          /* XXX move to callers */
 +
        sc->sc_dev->trans_start = jiffies;
        netif_start_queue(sc->sc_dev);          /* XXX move to callers */