X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/81eeea12a4ae3e30ce92f0a5afdfcd88c406b1c8..31a40f97ef54e10e2b3dc3cacb9cff436657c586:/package/madwifi/patches/431-compile_fixes.patch

diff --git a/package/madwifi/patches/431-compile_fixes.patch b/package/madwifi/patches/431-compile_fixes.patch
index 03ca2e64b..b11d406a0 100644
--- a/package/madwifi/patches/431-compile_fixes.patch
+++ b/package/madwifi/patches/431-compile_fixes.patch
@@ -1,34 +1,34 @@
 --- a/ath/if_ath.c
 +++ b/ath/if_ath.c
-@@ -2387,7 +2387,9 @@ ath_intr(int irq, void *dev_id, struct p
+@@ -2388,7 +2388,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))
++			if (napi_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
+@@ -2396,7 +2398,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);
++				__napi_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:
+@@ -7135,7 +7139,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);
++	napi_complete(napi);
 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
  	netif_rx_complete(dev, napi);
  #else