diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-05-11 20:16:13 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-05-11 20:16:13 +0000 |
| commit | 81eeea12a4ae3e30ce92f0a5afdfcd88c406b1c8 (patch) | |
| tree | 6fae6b354191b17d02746bd574a448273cd88d8e /package/madwifi/patches/431-compile_fixes.patch | |
| parent | 0723f810ee8d1c24ce7720496be4cdd988f9fb3f (diff) | |
[madwifi] make madwifi compile with kernel 2.6.29.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15773 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/madwifi/patches/431-compile_fixes.patch')
| -rw-r--r-- | package/madwifi/patches/431-compile_fixes.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/package/madwifi/patches/431-compile_fixes.patch b/package/madwifi/patches/431-compile_fixes.patch new file mode 100644 index 0000000000..03ca2e64bd --- /dev/null +++ b/package/madwifi/patches/431-compile_fixes.patch @@ -0,0 +1,35 @@ +--- a/ath/if_ath.c ++++ b/ath/if_ath.c +@@ -2387,7 +2387,9 @@ ath_intr(int irq, void *dev_id, struct p + if (status & (HAL_INT_RX | HAL_INT_RXPHY)) { + ath_uapsd_processtriggers(sc, hw_tsf); + sc->sc_isr &= ~HAL_INT_RX; +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29) ++ if (netif_rx_schedule_prep(&sc->sc_napi)) ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) + if (netif_rx_schedule_prep(dev, &sc->sc_napi)) + #else + if (netif_rx_schedule_prep(dev)) +@@ -2395,7 +2397,9 @@ ath_intr(int irq, void *dev_id, struct p + { + sc->sc_imask &= ~HAL_INT_RX; + ath_hal_intrset(ah, sc->sc_imask); +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29) ++ __netif_rx_schedule(&sc->sc_napi); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) + __netif_rx_schedule(dev, &sc->sc_napi); + #else + __netif_rx_schedule(dev); +@@ -7131,7 +7135,9 @@ rx_next: + local_irq_restore(flags); + } + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29) ++ netif_rx_complete(napi); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) + netif_rx_complete(dev, napi); + #else + netif_rx_complete(dev); |