update madwifi to latest rev - works around some crashiness

[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 cf3948a8d3f476f0b6cdc0f1999e51be5b94cc9a..753fc14b317159a8a064509f28f556c2e259aecc 100644 (file)
--- a/package/madwifi/patches/309-micfail_detect.patch
+++ b/package/madwifi/patches/309-micfail_detect.patch
@@ -1,7 +1,7 @@
-Index: madwifi-ng-r2799-20071030/ath/if_ath.c
+Index: madwifi-ng-r2834-20071106/ath/if_ath.c
 ===================================================================
---- madwifi-ng-r2799-20071030.orig/ath/if_ath.c        2007-10-31 14:04:51.797573253 +0100
-+++ madwifi-ng-r2799-20071030/ath/if_ath.c     2007-10-31 14:04:52.073588984 +0100
+--- madwifi-ng-r2834-20071106.orig/ath/if_ath.c        2007-11-07 14:02:05.345675505 +0100
++++ madwifi-ng-r2834-20071106/ath/if_ath.c     2007-11-07 14:02:05.625691466 +0100
 @@ -5743,6 +5743,7 @@
        u_int64_t rs_tsf;
        u_int processed = 0, early_stop = 0;
@@ -10,7 +10,7 @@ Index: madwifi-ng-r2799-20071030/ath/if_ath.c
  
        DPRINTF(sc, ATH_DEBUG_RX_PROC, "%s\n", __func__);
  process_rx_again:
-@@ -5839,24 +5840,7 @@
+@@ -5839,24 +5840,8 @@
                        }
                        if (rs->rs_status & HAL_RXERR_MIC) {
                                sc->sc_stats.ast_rx_badmic++;
@@ -33,10 +33,11 @@ Index: madwifi-ng-r2799-20071030/ath/if_ath.c
 -#endif
 -                              }
 +                              mic_fail = 1;
++                              goto rx_accept;
                        }
                        /*
                         * Reject error frames if we have no vaps that 
-@@ -5920,8 +5904,9 @@
+@@ -5920,8 +5905,9 @@
                /*
                 * Finished monitor mode handling, now reject
                 * error frames before passing to other vaps
@@ -47,11 +48,10 @@ Index: madwifi-ng-r2799-20071030/ath/if_ath.c
                        dev_kfree_skb(skb);
                        skb = NULL;
                        goto rx_next;
-@@ -5952,6 +5937,27 @@
-                                  sc->sc_hwmap[rs->rs_rate].ieeerate,
-                                  rs->rs_rssi);
+@@ -5930,6 +5916,26 @@
+               /* remove the CRC */
+               skb_trim(skb, skb->len - IEEE80211_CRC_LEN);
  
-+              /* MIC failure. Drop the packet in any case */
 +              if (mic_fail) {
 +                      /* Ignore control frames which are reported with mic error */
 +                  if ((((struct ieee80211_frame *)skb->data)->i_fc[0] &
@@ -70,15 +70,23 @@ Index: madwifi-ng-r2799-20071030/ath/if_ath.c
 +                      skb = NULL;
 +                      mic_fail = 0;
 +                      goto rx_next;
-+              }
++              }
 +
+               /*
+                * From this point on we assume the frame is at least
+                * as large as ieee80211_frame_min; verify that.
+@@ -5952,6 +5958,7 @@
+                                  sc->sc_hwmap[rs->rs_rate].ieeerate,
+                                  rs->rs_rssi);
+ 
++              /* MIC failure. Drop the packet in any case */
                /*
                 * Locate the node for sender, track state, and then
                 * pass the (referenced) node up to the 802.11 layer
-Index: madwifi-ng-r2799-20071030/net80211/ieee80211_crypto_ccmp.c
+Index: madwifi-ng-r2834-20071106/net80211/ieee80211_crypto_ccmp.c
 ===================================================================
---- madwifi-ng-r2799-20071030.orig/net80211/ieee80211_crypto_ccmp.c    2007-10-31 14:04:49.913465886 +0100
-+++ madwifi-ng-r2799-20071030/net80211/ieee80211_crypto_ccmp.c 2007-10-31 14:04:52.073588984 +0100
+--- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_crypto_ccmp.c    2007-11-07 14:02:03.345561529 +0100
++++ madwifi-ng-r2834-20071106/net80211/ieee80211_crypto_ccmp.c 2007-11-07 14:02:05.625691466 +0100
 @@ -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);
@@ -97,10 +105,10 @@ Index: madwifi-ng-r2799-20071030/net80211/ieee80211_crypto_ccmp.c
  {
        return 1;
  }
-Index: madwifi-ng-r2799-20071030/net80211/ieee80211_crypto.h
+Index: madwifi-ng-r2834-20071106/net80211/ieee80211_crypto.h
 ===================================================================
---- madwifi-ng-r2799-20071030.orig/net80211/ieee80211_crypto.h 2007-10-31 14:04:46.109249096 +0100
-+++ madwifi-ng-r2799-20071030/net80211/ieee80211_crypto.h      2007-10-31 14:04:52.073588984 +0100
+--- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_crypto.h 2007-11-07 14:01:58.929309860 +0100
++++ madwifi-ng-r2834-20071106/net80211/ieee80211_crypto.h      2007-11-07 14:02:05.633691920 +0100
 @@ -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);
@@ -123,10 +131,10 @@ Index: madwifi-ng-r2799-20071030/net80211/ieee80211_crypto.h
  }
  
  /*
-Index: madwifi-ng-r2799-20071030/net80211/ieee80211_crypto_none.c
+Index: madwifi-ng-r2834-20071106/net80211/ieee80211_crypto_none.c
 ===================================================================
---- madwifi-ng-r2799-20071030.orig/net80211/ieee80211_crypto_none.c    2007-10-31 14:04:46.113249322 +0100
-+++ madwifi-ng-r2799-20071030/net80211/ieee80211_crypto_none.c 2007-10-31 14:04:52.073588984 +0100
+--- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_crypto_none.c    2007-11-07 14:01:58.937310316 +0100
++++ madwifi-ng-r2834-20071106/net80211/ieee80211_crypto_none.c 2007-11-07 14:02:05.633691920 +0100
 @@ -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);
@@ -145,10 +153,10 @@ Index: madwifi-ng-r2799-20071030/net80211/ieee80211_crypto_none.c
  {
        struct ieee80211vap *vap = k->wk_private;
  
-Index: madwifi-ng-r2799-20071030/net80211/ieee80211_crypto_tkip.c
+Index: madwifi-ng-r2834-20071106/net80211/ieee80211_crypto_tkip.c
 ===================================================================
---- madwifi-ng-r2799-20071030.orig/net80211/ieee80211_crypto_tkip.c    2007-10-31 14:04:46.121249780 +0100
-+++ madwifi-ng-r2799-20071030/net80211/ieee80211_crypto_tkip.c 2007-10-31 14:04:52.077589210 +0100
+--- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_crypto_tkip.c    2007-11-07 14:01:58.945310770 +0100
++++ madwifi-ng-r2834-20071106/net80211/ieee80211_crypto_tkip.c 2007-11-07 14:02:05.633691920 +0100
 @@ -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);
@@ -176,10 +184,10 @@ Index: madwifi-ng-r2799-20071030/net80211/ieee80211_crypto_tkip.c
                struct ieee80211vap *vap = ctx->tc_vap;
                u8 mic[IEEE80211_WEP_MICLEN];
                u8 mic0[IEEE80211_WEP_MICLEN];
-Index: madwifi-ng-r2799-20071030/net80211/ieee80211_crypto_wep.c
+Index: madwifi-ng-r2834-20071106/net80211/ieee80211_crypto_wep.c
 ===================================================================
---- madwifi-ng-r2799-20071030.orig/net80211/ieee80211_crypto_wep.c     2007-10-31 14:04:46.129250236 +0100
-+++ madwifi-ng-r2799-20071030/net80211/ieee80211_crypto_wep.c  2007-10-31 14:04:52.077589210 +0100
+--- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_crypto_wep.c     2007-11-07 14:01:58.953311229 +0100
++++ madwifi-ng-r2834-20071106/net80211/ieee80211_crypto_wep.c  2007-11-07 14:02:05.633691920 +0100
 @@ -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);
@@ -198,10 +206,10 @@ Index: madwifi-ng-r2799-20071030/net80211/ieee80211_crypto_wep.c
  {
        return 1;
  }
-Index: madwifi-ng-r2799-20071030/net80211/ieee80211_input.c
+Index: madwifi-ng-r2834-20071106/net80211/ieee80211_input.c
 ===================================================================
---- madwifi-ng-r2799-20071030.orig/net80211/ieee80211_input.c  2007-10-31 14:04:51.801573482 +0100
-+++ madwifi-ng-r2799-20071030/net80211/ieee80211_input.c       2007-10-31 14:04:52.081589439 +0100
+--- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_input.c  2007-11-07 14:02:05.349675734 +0100
++++ madwifi-ng-r2834-20071106/net80211/ieee80211_input.c       2007-11-07 14:02:05.637692150 +0100
 @@ -632,7 +632,7 @@
                 * Next strip any MSDU crypto bits.
                 */
@@ -259,10 +267,10 @@ Index: madwifi-ng-r2799-20071030/net80211/ieee80211_input.c
  #ifdef IEEE80211_DEBUG
  /*
   * Debugging support.
-Index: madwifi-ng-r2799-20071030/net80211/ieee80211_proto.h
+Index: madwifi-ng-r2834-20071106/net80211/ieee80211_proto.h
 ===================================================================
---- madwifi-ng-r2799-20071030.orig/net80211/ieee80211_proto.h  2007-10-31 14:04:46.141250920 +0100
-+++ madwifi-ng-r2799-20071030/net80211/ieee80211_proto.h       2007-10-31 14:04:52.081589439 +0100
+--- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_proto.h  2007-11-07 14:01:58.965311910 +0100
++++ madwifi-ng-r2834-20071106/net80211/ieee80211_proto.h       2007-11-07 14:02:05.637692150 +0100
 @@ -91,6 +91,7 @@
  void ieee80211_set11gbasicrates(struct ieee80211_rateset *, enum ieee80211_phymode);
  enum ieee80211_phymode ieee80211_get11gbasicrates(struct ieee80211_rateset *);
@@ -271,10 +279,10 @@ Index: madwifi-ng-r2799-20071030/net80211/ieee80211_proto.h
  
  /*
   * Return the size of the 802.11 header for a management or data frame.
-Index: madwifi-ng-r2799-20071030/net80211/ieee80211_linux.c
+Index: madwifi-ng-r2834-20071106/net80211/ieee80211_linux.c
 ===================================================================
---- madwifi-ng-r2799-20071030.orig/net80211/ieee80211_linux.c  2007-10-31 14:04:49.705454030 +0100
-+++ madwifi-ng-r2799-20071030/net80211/ieee80211_linux.c       2007-10-31 14:04:52.081589439 +0100
+--- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_linux.c  2007-11-07 14:02:03.137549672 +0100
++++ madwifi-ng-r2834-20071106/net80211/ieee80211_linux.c       2007-11-07 14:02:05.641692376 +0100
 @@ -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,
@@ -286,10 +294,10 @@ Index: madwifi-ng-r2799-20071030/net80211/ieee80211_linux.c
        memset(&wrqu, 0, sizeof(wrqu));
        wrqu.data.length = strlen(buf);
        wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);
-Index: madwifi-ng-r2799-20071030/net80211/ieee80211_output.c
+Index: madwifi-ng-r2834-20071106/net80211/ieee80211_output.c
 ===================================================================
---- madwifi-ng-r2799-20071030.orig/net80211/ieee80211_output.c 2007-10-31 14:04:46.157251830 +0100
-+++ madwifi-ng-r2799-20071030/net80211/ieee80211_output.c      2007-10-31 14:04:52.081589439 +0100
+--- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_output.c 2007-11-07 14:01:58.981312821 +0100
++++ madwifi-ng-r2834-20071106/net80211/ieee80211_output.c      2007-11-07 14:02:05.641692376 +0100
 @@ -1079,13 +1079,16 @@
                        cip = (struct ieee80211_cipher *) key->wk_cipher;
                        ciphdrsize = cip->ic_header;
@@ -310,11 +318,11 @@ Index: madwifi-ng-r2799-20071030/net80211/ieee80211_output.c
  
                /*
                 * Allocate sk_buff for each subsequent fragment; First fragment
-Index: madwifi-ng-r2799-20071030/net80211/ieee80211_node.c
+Index: madwifi-ng-r2834-20071106/net80211/ieee80211_node.c
 ===================================================================
---- madwifi-ng-r2799-20071030.orig/net80211/ieee80211_node.c   2007-10-31 14:04:51.805573711 +0100
-+++ madwifi-ng-r2799-20071030/net80211/ieee80211_node.c        2007-10-31 14:04:52.085589669 +0100
-@@ -1884,11 +1884,13 @@
+--- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_node.c   2007-11-07 14:02:05.357676193 +0100
++++ madwifi-ng-r2834-20071106/net80211/ieee80211_node.c        2007-11-07 14:02:05.645692605 +0100
+@@ -1899,11 +1899,13 @@
        /* From this point onwards we can no longer find the node,
         * so no more references are generated
         */