upgrade madwifi to r2756

[openwrt/openwrt.git] / package / madwifi / patches / 309-micfail_detect.patch

diff --git a/package/madwifi/patches/309-micfail_detect.patch b/package/madwifi/patches/309-micfail_detect.patch
index ef10cd1f9235c53a232d766c534200db2f787f9f..88273e29b8c056a718bcac733042840c39b80914 100644 (file)
--- a/package/madwifi/patches/309-micfail_detect.patch
+++ b/package/madwifi/patches/309-micfail_detect.patch
@@ -1,16 +1,16 @@
-Index: madwifi-ng-r2525-20070630/ath/if_ath.c
+Index: madwifi-ng-r2756-20071018/ath/if_ath.c
 ===================================================================
---- madwifi-ng-r2525-20070630.orig/ath/if_ath.c        2007-07-03 23:02:33.594143250 +0200
-+++ madwifi-ng-r2525-20070630/ath/if_ath.c     2007-07-03 23:02:34.014169500 +0200
-@@ -5626,6 +5626,7 @@
+--- madwifi-ng-r2756-20071018.orig/ath/if_ath.c        2007-10-24 06:20:21.225898872 +0200
++++ madwifi-ng-r2756-20071018/ath/if_ath.c     2007-10-24 06:20:21.505914829 +0200
+@@ -5743,6 +5743,7 @@
        u_int64_t rs_tsf;
        u_int processed = 0, early_stop = 0;
        u_int rx_limit = dev->quota;
 +      u_int mic_fail = 0;
  
-       /* Let the 802.11 layer know about the new noise floor */
-       sc->sc_channoise = ath_hal_get_channel_noise(ah, &(sc->sc_curchan));
-@@ -5720,25 +5721,7 @@
+       DPRINTF(sc, ATH_DEBUG_RX_PROC, "%s\n", __func__);
+ process_rx_again:
+@@ -5839,24 +5840,7 @@
                        }
                        if (rs->rs_status & HAL_RXERR_MIC) {
                                sc->sc_stats.ast_rx_badmic++;
@@ -19,7 +19,6 @@ Index: madwifi-ng-r2525-20070630/ath/if_ath.c
 -                               * the 802.11 header for notification.
 -                               */
 -                              /* XXX frag's and QoS frames */
--                              len = rs->rs_datalen;
 -                              if (len >= sizeof (struct ieee80211_frame)) {
 -                                      bus_dma_sync_single(sc->sc_bdev,
 -                                          bf->bf_skbaddr, len,
@@ -37,7 +36,7 @@ Index: madwifi-ng-r2525-20070630/ath/if_ath.c
                        }
                        /*
                         * Reject error frames if we have no vaps that 
-@@ -5802,8 +5785,9 @@
+@@ -5920,8 +5904,9 @@
                /*
                 * Finished monitor mode handling, now reject
                 * error frames before passing to other vaps
@@ -48,7 +47,7 @@ Index: madwifi-ng-r2525-20070630/ath/if_ath.c
                        dev_kfree_skb(skb);
                        skb = NULL;
                        goto rx_next;
-@@ -5834,6 +5818,27 @@
+@@ -5952,6 +5937,27 @@
                                   sc->sc_hwmap[rs->rs_rate].ieeerate,
                                   rs->rs_rssi);
  
@@ -76,10 +75,10 @@ Index: madwifi-ng-r2525-20070630/ath/if_ath.c
                /*
                 * Locate the node for sender, track state, and then
                 * pass the (referenced) node up to the 802.11 layer
-Index: madwifi-ng-r2525-20070630/net80211/ieee80211_crypto_ccmp.c
+Index: madwifi-ng-r2756-20071018/net80211/ieee80211_crypto_ccmp.c
 ===================================================================
---- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_crypto_ccmp.c    2007-07-03 23:02:31.690024250 +0200
-+++ madwifi-ng-r2525-20070630/net80211/ieee80211_crypto_ccmp.c 2007-07-03 23:02:34.026170250 +0200
+--- madwifi-ng-r2756-20071018.orig/net80211/ieee80211_crypto_ccmp.c    2007-10-24 06:20:19.581805179 +0200
++++ madwifi-ng-r2756-20071018/net80211/ieee80211_crypto_ccmp.c 2007-10-24 06:20:21.505914829 +0200
 @@ -73,7 +73,7 @@
  static int ccmp_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
  static int ccmp_decap(struct ieee80211_key *, struct sk_buff *, int);
@@ -98,10 +97,10 @@ Index: madwifi-ng-r2525-20070630/net80211/ieee80211_crypto_ccmp.c
  {
        return 1;
  }
-Index: madwifi-ng-r2525-20070630/net80211/ieee80211_crypto.h
+Index: madwifi-ng-r2756-20071018/net80211/ieee80211_crypto.h
 ===================================================================
---- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_crypto.h 2007-07-03 23:02:24.549578000 +0200
-+++ madwifi-ng-r2525-20070630/net80211/ieee80211_crypto.h      2007-07-03 23:02:34.054172000 +0200
+--- madwifi-ng-r2756-20071018.orig/net80211/ieee80211_crypto.h 2007-10-24 06:20:16.013601842 +0200
++++ madwifi-ng-r2756-20071018/net80211/ieee80211_crypto.h      2007-10-24 06:20:21.513915288 +0200
 @@ -145,7 +145,7 @@
        int (*ic_encap)(struct ieee80211_key *, struct sk_buff *, u_int8_t);
        int (*ic_decap)(struct ieee80211_key *, struct sk_buff *, int);
@@ -124,10 +123,10 @@ Index: madwifi-ng-r2525-20070630/net80211/ieee80211_crypto.h
  }
  
  /*
-Index: madwifi-ng-r2525-20070630/net80211/ieee80211_crypto_none.c
+Index: madwifi-ng-r2756-20071018/net80211/ieee80211_crypto_none.c
 ===================================================================
---- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_crypto_none.c    2007-07-03 23:02:24.557578500 +0200
-+++ madwifi-ng-r2525-20070630/net80211/ieee80211_crypto_none.c 2007-07-03 23:02:34.074173250 +0200
+--- madwifi-ng-r2756-20071018.orig/net80211/ieee80211_crypto_none.c    2007-10-24 06:20:16.017602067 +0200
++++ madwifi-ng-r2756-20071018/net80211/ieee80211_crypto_none.c 2007-10-24 06:20:21.513915288 +0200
 @@ -52,7 +52,7 @@
  static int none_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
  static int none_decap(struct ieee80211_key *, struct sk_buff *, int);
@@ -146,10 +145,10 @@ Index: madwifi-ng-r2525-20070630/net80211/ieee80211_crypto_none.c
  {
        struct ieee80211vap *vap = k->wk_private;
  
-Index: madwifi-ng-r2525-20070630/net80211/ieee80211_crypto_tkip.c
+Index: madwifi-ng-r2756-20071018/net80211/ieee80211_crypto_tkip.c
 ===================================================================
---- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_crypto_tkip.c    2007-07-03 23:02:24.565579000 +0200
-+++ madwifi-ng-r2525-20070630/net80211/ieee80211_crypto_tkip.c 2007-07-03 23:02:34.114175750 +0200
+--- madwifi-ng-r2756-20071018.orig/net80211/ieee80211_crypto_tkip.c    2007-10-24 06:20:16.025602525 +0200
++++ madwifi-ng-r2756-20071018/net80211/ieee80211_crypto_tkip.c 2007-10-24 06:20:21.513915288 +0200
 @@ -57,7 +57,7 @@
  static int tkip_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
  static int tkip_enmic(struct ieee80211_key *, struct sk_buff *, int);
@@ -177,10 +176,10 @@ Index: madwifi-ng-r2525-20070630/net80211/ieee80211_crypto_tkip.c
                struct ieee80211vap *vap = ctx->tc_vap;
                u8 mic[IEEE80211_WEP_MICLEN];
                u8 mic0[IEEE80211_WEP_MICLEN];
-Index: madwifi-ng-r2525-20070630/net80211/ieee80211_crypto_wep.c
+Index: madwifi-ng-r2756-20071018/net80211/ieee80211_crypto_wep.c
 ===================================================================
---- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_crypto_wep.c     2007-07-03 23:02:24.573579500 +0200
-+++ madwifi-ng-r2525-20070630/net80211/ieee80211_crypto_wep.c  2007-07-03 23:02:34.134177000 +0200
+--- madwifi-ng-r2756-20071018.orig/net80211/ieee80211_crypto_wep.c     2007-10-24 06:20:16.033602982 +0200
++++ madwifi-ng-r2756-20071018/net80211/ieee80211_crypto_wep.c  2007-10-24 06:20:21.513915288 +0200
 @@ -54,7 +54,7 @@
  static int wep_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
  static int wep_decap(struct ieee80211_key *, struct sk_buff *, int);
@@ -199,10 +198,10 @@ Index: madwifi-ng-r2525-20070630/net80211/ieee80211_crypto_wep.c
  {
        return 1;
  }
-Index: madwifi-ng-r2525-20070630/net80211/ieee80211_input.c
+Index: madwifi-ng-r2756-20071018/net80211/ieee80211_input.c
 ===================================================================
---- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_input.c  2007-07-03 23:02:33.598143500 +0200
-+++ madwifi-ng-r2525-20070630/net80211/ieee80211_input.c       2007-07-03 23:02:34.134177000 +0200
+--- madwifi-ng-r2756-20071018.orig/net80211/ieee80211_input.c  2007-10-24 06:20:21.229899101 +0200
++++ madwifi-ng-r2756-20071018/net80211/ieee80211_input.c       2007-10-24 06:20:21.517915515 +0200
 @@ -632,7 +632,7 @@
                 * Next strip any MSDU crypto bits.
                 */
@@ -212,7 +211,7 @@ Index: madwifi-ng-r2525-20070630/net80211/ieee80211_input.c
                        IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
                                ni->ni_macaddr, "data", "%s", "demic error");
                        IEEE80211_NODE_STAT(ni, rx_demicfail);
-@@ -3771,6 +3771,47 @@
+@@ -3781,6 +3781,47 @@
  }
  #endif
  
@@ -260,10 +259,10 @@ Index: madwifi-ng-r2525-20070630/net80211/ieee80211_input.c
  #ifdef IEEE80211_DEBUG
  /*
   * Debugging support.
-Index: madwifi-ng-r2525-20070630/net80211/ieee80211_proto.h
+Index: madwifi-ng-r2756-20071018/net80211/ieee80211_proto.h
 ===================================================================
---- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_proto.h  2007-07-03 23:02:24.589580500 +0200
-+++ madwifi-ng-r2525-20070630/net80211/ieee80211_proto.h       2007-07-03 23:02:34.190180500 +0200
+--- madwifi-ng-r2756-20071018.orig/net80211/ieee80211_proto.h  2007-10-24 06:20:16.045603664 +0200
++++ madwifi-ng-r2756-20071018/net80211/ieee80211_proto.h       2007-10-24 06:20:21.517915515 +0200
 @@ -91,6 +91,7 @@
  void ieee80211_set11gbasicrates(struct ieee80211_rateset *, enum ieee80211_phymode);
  enum ieee80211_phymode ieee80211_get11gbasicrates(struct ieee80211_rateset *);
@@ -272,11 +271,11 @@ Index: madwifi-ng-r2525-20070630/net80211/ieee80211_proto.h
  
  /*
   * Return the size of the 802.11 header for a management or data frame.
-Index: madwifi-ng-r2525-20070630/net80211/ieee80211_linux.c
+Index: madwifi-ng-r2756-20071018/net80211/ieee80211_linux.c
 ===================================================================
---- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_linux.c  2007-07-03 23:02:31.362003750 +0200
-+++ madwifi-ng-r2525-20070630/net80211/ieee80211_linux.c       2007-07-03 23:02:34.218182250 +0200
-@@ -291,8 +291,8 @@
+--- madwifi-ng-r2756-20071018.orig/net80211/ieee80211_linux.c  2007-10-24 06:20:19.373793330 +0200
++++ madwifi-ng-r2756-20071018/net80211/ieee80211_linux.c       2007-10-24 06:20:21.517915515 +0200
+@@ -339,8 +339,8 @@
        /* TODO: needed parameters: count, keyid, key type, src address, TSC */
        snprintf(buf, sizeof(buf), "%s(keyid=%d %scast addr=%s)", tag,
                k->wk_keyix,
@@ -287,10 +286,10 @@ Index: madwifi-ng-r2525-20070630/net80211/ieee80211_linux.c
        memset(&wrqu, 0, sizeof(wrqu));
        wrqu.data.length = strlen(buf);
        wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);
-Index: madwifi-ng-r2525-20070630/net80211/ieee80211_output.c
+Index: madwifi-ng-r2756-20071018/net80211/ieee80211_output.c
 ===================================================================
---- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_output.c 2007-07-03 23:02:24.605581500 +0200
-+++ madwifi-ng-r2525-20070630/net80211/ieee80211_output.c      2007-07-03 23:02:34.218182250 +0200
+--- madwifi-ng-r2756-20071018.orig/net80211/ieee80211_output.c 2007-10-24 06:20:16.061604575 +0200
++++ madwifi-ng-r2756-20071018/net80211/ieee80211_output.c      2007-10-24 06:20:21.521915740 +0200
 @@ -1079,13 +1079,16 @@
                        cip = (struct ieee80211_cipher *) key->wk_cipher;
                        ciphdrsize = cip->ic_header;
@@ -311,11 +310,11 @@ Index: madwifi-ng-r2525-20070630/net80211/ieee80211_output.c
  
                /*
                 * Allocate sk_buff for each subsequent fragment; First fragment
-Index: madwifi-ng-r2525-20070630/net80211/ieee80211_node.c
+Index: madwifi-ng-r2756-20071018/net80211/ieee80211_node.c
 ===================================================================
---- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_node.c   2007-07-03 23:02:33.598143500 +0200
-+++ madwifi-ng-r2525-20070630/net80211/ieee80211_node.c        2007-07-03 23:02:34.266185250 +0200
-@@ -1891,11 +1891,13 @@
+--- madwifi-ng-r2756-20071018.orig/net80211/ieee80211_node.c   2007-10-24 06:20:21.237899558 +0200
++++ madwifi-ng-r2756-20071018/net80211/ieee80211_node.c        2007-10-24 06:20:21.521915740 +0200
+@@ -1880,11 +1880,13 @@
        /* From this point onwards we can no longer find the node,
         * so no more references are generated
         */