03ca2e64bd7934fb630da1a35cd8a8c2820943a6
[openwrt.git] / package / madwifi / patches / 431-compile_fixes.patch
1 --- a/ath/if_ath.c
2 +++ b/ath/if_ath.c
3 @@ -2387,7 +2387,9 @@ ath_intr(int irq, void *dev_id, struct p
4                 if (status & (HAL_INT_RX | HAL_INT_RXPHY)) {
5                         ath_uapsd_processtriggers(sc, hw_tsf);
6                         sc->sc_isr &= ~HAL_INT_RX;
7 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
8 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
9 +                       if (netif_rx_schedule_prep(&sc->sc_napi))
10 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
11                         if (netif_rx_schedule_prep(dev, &sc->sc_napi))
12  #else
13                         if (netif_rx_schedule_prep(dev))
14 @@ -2395,7 +2397,9 @@ ath_intr(int irq, void *dev_id, struct p
15                         {
16                                 sc->sc_imask &= ~HAL_INT_RX;
17                                 ath_hal_intrset(ah, sc->sc_imask);
18 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
19 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
20 +                               __netif_rx_schedule(&sc->sc_napi);
21 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
22                                 __netif_rx_schedule(dev, &sc->sc_napi);
23  #else
24                                 __netif_rx_schedule(dev);
25 @@ -7131,7 +7135,9 @@ rx_next:
26                 local_irq_restore(flags);
27         }
28  
29 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
30 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
31 +       netif_rx_complete(napi);
32 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
33         netif_rx_complete(dev, napi);
34  #else
35         netif_rx_complete(dev);