[ar7] revert part of r16112, the setup.c part needs more testing

[openwrt.git] / 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 03ca2e6..16485cb 100644 (file)
--- a/package/madwifi/patches/431-compile_fixes.patch
+++ b/package/madwifi/patches/431-compile_fixes.patch
@@ -6,7 +6,7 @@
                        sc->sc_isr &= ~HAL_INT_RX;
 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
                        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
 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
                        if (netif_rx_schedule_prep(dev, &sc->sc_napi))
  #else


@@ -17,7 +17,7 @@
                                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)
                                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
 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
                                __netif_rx_schedule(dev, &sc->sc_napi);
  #else


@@ -28,7 +28,7 @@
  
 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
  
 -#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
 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
        netif_rx_complete(dev, napi);
  #else