madwifi: fix noderef and state machine issues in the currently unused ap-to-ap wds...

[openwrt/openwrt.git] / package / madwifi / patches / 342-performance.patch

diff --git a/package/madwifi/patches/342-performance.patch b/package/madwifi/patches/342-performance.patch
index 54b30ac0058bf3499bfb3ab4ba6cb4ebd7ea3a01..8015643dcdbb3d77c9a8590fbac2a243ad5dda84 100644 (file)
--- a/package/madwifi/patches/342-performance.patch
+++ b/package/madwifi/patches/342-performance.patch
@@ -1,8 +1,6 @@
-Index: madwifi-trunk-r3314/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-06-01 02:04:25.000000000 +0200
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-06-01 02:04:25.000000000 +0200
-@@ -3237,7 +3237,6 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -3239,7 +3239,6 @@ ath_hardstart(struct sk_buff *skb, struc
        struct ath_softc *sc = dev->priv;
        struct ieee80211_node *ni = NULL;
        struct ath_buf *bf = NULL;
@@ -10,7 +8,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        ath_bufhead bf_head;
        struct ath_buf *tbf, *tempbf;
        struct sk_buff *tskb;
-@@ -3249,6 +3248,7 @@
+@@ -3251,6 +3250,7 @@ ath_hardstart(struct sk_buff *skb, struc
        */
        int requeue = 0;
  #ifdef ATH_SUPERG_FF
@@ -18,7 +16,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        unsigned int pktlen;
        struct ieee80211com *ic = &sc->sc_ic;
        struct ath_node *an;
-@@ -3314,27 +3314,9 @@
+@@ -3316,27 +3316,9 @@ ath_hardstart(struct sk_buff *skb, struc
                requeue = 1;
                goto hardstart_fail;
        }
@@ -46,11 +44,9 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        /* NB: use this lock to protect an->an_tx_ffbuf (and txq->axq_stageq)
         *     in athff_can_aggregate() call too. */
        ATH_TXQ_LOCK_IRQ(txq);
-Index: madwifi-trunk-r3314/net80211/ieee80211_output.c
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_output.c       2008-06-01 02:04:24.000000000 +0200
-+++ madwifi-trunk-r3314/net80211/ieee80211_output.c    2008-06-01 02:04:25.000000000 +0200
-@@ -283,7 +283,7 @@
+--- a/net80211/ieee80211_output.c
++++ b/net80211/ieee80211_output.c
+@@ -283,7 +283,7 @@ ieee80211_hardstart(struct sk_buff *skb,
         * normal vap. */
        if (vap->iv_xrvap && (ni == vap->iv_bss) &&
            vap->iv_xrvap->iv_sta_assoc) {
@@ -59,7 +55,7 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_output.c
                if (skb1) {
                        memset(SKB_CB(skb1), 0, sizeof(struct ieee80211_cb));
  #ifdef IEEE80211_DEBUG_REFCNT
-@@ -566,7 +566,7 @@
+@@ -566,7 +566,7 @@ ieee80211_skbhdr_adjust(struct ieee80211
        struct ieee80211_key *key, struct sk_buff *skb, int ismulticast)
  {
        /* XXX pre-calculate per node? */
@@ -68,7 +64,7 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_output.c
        int need_tailroom = 0;
  #ifdef ATH_SUPERG_FF
        int isff = ATH_FF_MAGIC_PRESENT(skb);
-@@ -608,109 +608,56 @@
+@@ -608,109 +608,56 @@ ieee80211_skbhdr_adjust(struct ieee80211
                                need_tailroom += cip->ic_miclen;
        }
  
@@ -216,11 +212,9 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_output.c
  }
  
  #define       KEY_UNDEFINED(k)        ((k).wk_cipher == &ieee80211_cipher_none)
-Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c        2008-06-01 02:04:25.000000000 +0200
-+++ madwifi-trunk-r3314/net80211/ieee80211_input.c     2008-06-01 02:04:33.000000000 +0200
-@@ -204,7 +204,6 @@
+--- a/net80211/ieee80211_input.c
++++ b/net80211/ieee80211_input.c
+@@ -204,7 +204,6 @@ ieee80211_input(struct ieee80211vap * va
        struct ieee80211_frame *wh;
        struct ieee80211_key *key;
        struct ether_header *eh;
@@ -228,7 +222,7 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
  #ifdef ATH_SUPERG_FF
        struct llc *llc;
  #endif
-@@ -244,20 +243,6 @@
+@@ -244,20 +243,6 @@ ieee80211_input(struct ieee80211vap * va
                vap->iv_stats.is_rx_tooshort++;
                goto out;
        }
@@ -249,7 +243,7 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
  
        /*
         * Bit of a cheat here, we use a pointer for a 3-address
-@@ -738,7 +723,7 @@
+@@ -738,7 +723,7 @@ ieee80211_input(struct ieee80211vap * va
                        /* ether_type must be length as FF frames are always LLC/SNAP encap'd */ 
                        frame_len = ntohs(eh_tmp->ether_type); 
  
@@ -258,7 +252,7 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
                        if (skb1 == NULL)
                                goto err;
                        ieee80211_skb_copy_noderef(skb, skb1);
-@@ -1137,7 +1122,7 @@
+@@ -1137,7 +1122,7 @@ ieee80211_deliver_data(struct ieee80211_
  
                if (ETHER_IS_MULTICAST(eh->ether_dhost) && !netif_queue_stopped(dev)) {
                        /* Create a SKB for the BSS to send out. */