fix remaining netif_rx calls in napi polling patch

[openwrt.git] / package / madwifi / patches / 300-napi_polling.patch

diff --git a/package/madwifi/patches/300-napi_polling.patch b/package/madwifi/patches/300-napi_polling.patch
index f883ae4..8300225 100644 (file)
--- a/package/madwifi/patches/300-napi_polling.patch
+++ b/package/madwifi/patches/300-napi_polling.patch
@@ -1,7 +1,7 @@
-Index: madwifi-ng-r2756-20071018/ath/if_ath.c
+Index: madwifi-ng-r2834-20071106/ath/if_ath.c

 ===================================================================
 ===================================================================

---- madwifi-ng-r2756-20071018.orig/ath/if_ath.c        2007-10-24 06:20:20.433853739 +0200
-+++ madwifi-ng-r2756-20071018/ath/if_ath.c     2007-10-24 06:20:20.749871745 +0200
+--- madwifi-ng-r2834-20071106.orig/ath/if_ath.c        2007-11-26 12:29:04.313083193 +0100
++++ madwifi-ng-r2834-20071106/ath/if_ath.c     2007-11-26 12:29:04.341084793 +0100

 @@ -170,7 +170,7 @@
        int, u_int64_t);
  static void ath_setdefantenna(struct ath_softc *, u_int);
 @@ -170,7 +170,7 @@
        int, u_int64_t);
  static void ath_setdefantenna(struct ath_softc *, u_int);


@@ -252,7 +252,7 @@ Index: madwifi-ng-r2756-20071018/ath/if_ath.c
        unsigned int i;
  
        /* XXX return value */
        unsigned int i;
  
        /* XXX return value */

-@@ -9336,9 +9417,9 @@
+@@ -9343,9 +9424,9 @@

        dev->mtu = mtu;
        if ((dev->flags & IFF_RUNNING) && !sc->sc_invalid) {
                /* NB: the rx buffers may need to be reallocated */
        dev->mtu = mtu;
        if ((dev->flags & IFF_RUNNING) && !sc->sc_invalid) {
                /* NB: the rx buffers may need to be reallocated */


@@ -264,10 +264,10 @@ Index: madwifi-ng-r2756-20071018/ath/if_ath.c
        }
        ATH_UNLOCK(sc);
  
        }
        ATH_UNLOCK(sc);
  

-Index: madwifi-ng-r2756-20071018/ath/if_athvar.h
+Index: madwifi-ng-r2834-20071106/ath/if_athvar.h

 ===================================================================
 ===================================================================

---- madwifi-ng-r2756-20071018.orig/ath/if_athvar.h     2007-10-24 06:20:19.789817035 +0200
-+++ madwifi-ng-r2756-20071018/ath/if_athvar.h  2007-10-24 06:20:20.749871745 +0200
+--- madwifi-ng-r2834-20071106.orig/ath/if_athvar.h     2007-11-26 12:29:04.233078645 +0100
++++ madwifi-ng-r2834-20071106/ath/if_athvar.h  2007-11-26 12:29:04.341084793 +0100

 @@ -50,6 +50,10 @@
  #include <asm/io.h>
  #include <linux/list.h>
 @@ -50,6 +50,10 @@
  #include <asm/io.h>
  #include <linux/list.h>


@@ -304,10 +304,10 @@ Index: madwifi-ng-r2756-20071018/ath/if_athvar.h
  
  #define       ATH_RXBUF_LOCK_INIT(_sc)        spin_lock_init(&(_sc)->sc_rxbuflock)
  #define       ATH_RXBUF_LOCK_DESTROY(_sc)
  
  #define       ATH_RXBUF_LOCK_INIT(_sc)        spin_lock_init(&(_sc)->sc_rxbuflock)
  #define       ATH_RXBUF_LOCK_DESTROY(_sc)

-Index: madwifi-ng-r2756-20071018/net80211/ieee80211_input.c
+Index: madwifi-ng-r2834-20071106/net80211/ieee80211_input.c

 ===================================================================
 ===================================================================

---- madwifi-ng-r2756-20071018.orig/net80211/ieee80211_input.c  2007-10-24 06:20:19.113778513 +0200
-+++ madwifi-ng-r2756-20071018/net80211/ieee80211_input.c       2007-10-24 06:20:20.757872202 +0200
+--- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_input.c  2007-11-26 12:29:04.197076583 +0100
++++ madwifi-ng-r2834-20071106/net80211/ieee80211_input.c       2007-11-26 12:29:54.727956181 +0100

 @@ -1128,8 +1128,9 @@
                if (ni->ni_vlan != 0 && vap->iv_vlgrp != NULL) {
                        /* attach vlan tag */
 @@ -1128,8 +1128,9 @@
                if (ni->ni_vlan != 0 && vap->iv_vlgrp != NULL) {
                        /* attach vlan tag */


@@ -320,3 +320,25 @@ Index: madwifi-ng-r2756-20071018/net80211/ieee80211_input.c
                dev->last_rx = jiffies;
        }
  }
                dev->last_rx = jiffies;
        }
  }

+@@ -2235,7 +2236,7 @@
+               skb1->pkt_type = PACKET_OTHERHOST;
+               skb1->protocol = __constant_htons(0x0019);  /* ETH_P_80211_RAW */
+ 
+-              netif_rx(skb1);
++              netif_receive_skb(skb1);
+       }
+ }
+ 
+Index: madwifi-ng-r2834-20071106/net80211/ieee80211_monitor.c
+===================================================================
+--- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_monitor.c        2007-11-26 12:29:24.998261983 +0100
++++ madwifi-ng-r2834-20071106/net80211/ieee80211_monitor.c     2007-11-26 12:29:32.962715851 +0100
+@@ -567,7 +567,7 @@
+                       skb1->pkt_type = pkttype;
+                       skb1->protocol = __constant_htons(0x0019); /* ETH_P_80211_RAW */
+ 
+-                      netif_rx(skb1);
++                      netif_receive_skb(skb1);
+ 
+                       vap->iv_devstats.rx_packets++;
+                       vap->iv_devstats.rx_bytes += skb1->len;