make madwifi compile with kernel 2.6.29.

SVN-Revision: 15773
This commit is contained in:
Hauke Mehrtens 2009-05-11 20:16:13 +00:00
parent f24a7c7a68
commit 51445f3a18
2 changed files with 1971 additions and 0 deletions

File diff suppressed because it is too large Load diff

View file

@ -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);