brcm47xx: update bcma and ssb to master-2011-07-21

[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 3a5d1be..ca4103a 100644 (file)
--- a/package/madwifi/patches/309-micfail_detect.patch
+++ b/package/madwifi/patches/309-micfail_detect.patch
@@ -1,8 +1,6 @@
-Index: madwifi-trunk-r3314/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c
-+++ madwifi-trunk-r3314/ath/if_ath.c
-@@ -6446,6 +6446,7 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -6457,6 +6457,7 @@ ath_rx_poll(struct net_device *dev, int
        int type;
        u_int phyerr;
        u_int processed = 0, early_stop = 0;
@@ -10,7 +8,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  
        DPRINTF(sc, ATH_DEBUG_RX_PROC, "invoked\n");
  process_rx_again:
-@@ -6547,24 +6548,8 @@
+@@ -6558,24 +6559,8 @@ process_rx_again:
                        }
                        if (rs->rs_status & HAL_RXERR_MIC) {
                                sc->sc_stats.ast_rx_badmic++;
@@ -37,7 +35,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                        }
                        /*
                         * Reject error frames if we have no vaps that
-@@ -6603,8 +6588,9 @@
+@@ -6614,8 +6599,9 @@ rx_accept:
                /*
                 * Finished monitor mode handling, now reject
                 * error frames before passing to other vaps
@@ -48,7 +46,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                        ieee80211_dev_kfree_skb(&skb);
                        goto rx_next;
                }
-@@ -6612,6 +6598,26 @@
+@@ -6623,6 +6609,26 @@ rx_accept:
                /* remove the CRC */
                skb_trim(skb, skb->len - IEEE80211_CRC_LEN);
  
@@ -75,7 +73,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                /*
                 * From this point on we assume the frame is at least
                 * as large as ieee80211_frame_min; verify that.
-@@ -6624,6 +6630,7 @@
+@@ -6635,6 +6641,7 @@ rx_accept:
                        goto rx_next;
                }
  
@@ -83,11 +81,9 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                /*
                 * Normal receive.
                 */
-Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_ccmp.c
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto_ccmp.c
-+++ madwifi-trunk-r3314/net80211/ieee80211_crypto_ccmp.c
-@@ -73,7 +73,7 @@
+--- a/net80211/ieee80211_crypto_ccmp.c
++++ b/net80211/ieee80211_crypto_ccmp.c
+@@ -73,7 +73,7 @@ static int ccmp_setkey(struct ieee80211_
  static int ccmp_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
  static int ccmp_decap(struct ieee80211_key *, struct sk_buff *, int);
  static int ccmp_enmic(struct ieee80211_key *, struct sk_buff *, int);
@@ -96,7 +92,7 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_ccmp.c
  
  static const struct ieee80211_cipher ccmp = {
        .ic_name        = "AES-CCM",
-@@ -308,7 +308,7 @@
+@@ -314,7 +314,7 @@ ccmp_decap(struct ieee80211_key *k, stru
   * Verify and strip MIC from the frame.
   */
  static int
@@ -105,11 +101,9 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_ccmp.c
  {
        return 1;
  }
-Index: madwifi-trunk-r3314/net80211/ieee80211_crypto.h
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto.h
-+++ madwifi-trunk-r3314/net80211/ieee80211_crypto.h
-@@ -145,7 +145,7 @@
+--- a/net80211/ieee80211_crypto.h
++++ b/net80211/ieee80211_crypto.h
+@@ -145,7 +145,7 @@ struct ieee80211_cipher {
        int (*ic_encap)(struct ieee80211_key *, struct sk_buff *, u_int8_t);
        int (*ic_decap)(struct ieee80211_key *, struct sk_buff *, int);
        int (*ic_enmic)(struct ieee80211_key *, struct sk_buff *, int);
@@ -118,7 +112,7 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_crypto.h
  };
  extern const struct ieee80211_cipher ieee80211_cipher_none;
  
-@@ -163,10 +163,10 @@
+@@ -163,10 +163,10 @@ struct ieee80211_key *ieee80211_crypto_d
   */
  static __inline int
  ieee80211_crypto_demic(struct ieee80211vap *vap, struct ieee80211_key *k,
@@ -131,11 +125,9 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_crypto.h
  }
  
  /*
-Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_none.c
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto_none.c
-+++ madwifi-trunk-r3314/net80211/ieee80211_crypto_none.c
-@@ -52,7 +52,7 @@
+--- a/net80211/ieee80211_crypto_none.c
++++ b/net80211/ieee80211_crypto_none.c
+@@ -52,7 +52,7 @@ static int none_setkey(struct ieee80211_
  static int none_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
  static int none_decap(struct ieee80211_key *, struct sk_buff *, int);
  static int none_enmic(struct ieee80211_key *, struct sk_buff *, int);
@@ -144,7 +136,7 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_none.c
  
  const struct ieee80211_cipher ieee80211_cipher_none = {
        .ic_name        = "NONE",
-@@ -137,7 +137,7 @@
+@@ -137,7 +137,7 @@ none_enmic(struct ieee80211_key *k, stru
  }
  
  static int
@@ -153,11 +145,9 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_none.c
  {
        struct ieee80211vap *vap = k->wk_private;
  
-Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_tkip.c
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto_tkip.c
-+++ madwifi-trunk-r3314/net80211/ieee80211_crypto_tkip.c
-@@ -57,7 +57,7 @@
+--- a/net80211/ieee80211_crypto_tkip.c
++++ b/net80211/ieee80211_crypto_tkip.c
+@@ -57,7 +57,7 @@ static int tkip_setkey(struct ieee80211_
  static int tkip_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
  static int tkip_enmic(struct ieee80211_key *, struct sk_buff *, int);
  static int tkip_decap(struct ieee80211_key *, struct sk_buff *, int);
@@ -166,7 +156,7 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_tkip.c
  
  static const struct ieee80211_cipher tkip  = {
        .ic_name        = "TKIP",
-@@ -339,7 +339,7 @@
+@@ -339,7 +339,7 @@ tkip_decap(struct ieee80211_key *k, stru
   * Verify and strip MIC from the frame.
   */
  static int
@@ -175,7 +165,7 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_tkip.c
  {
        struct tkip_ctx *ctx = k->wk_private;
        struct sk_buff *skb;
-@@ -355,7 +355,7 @@
+@@ -355,7 +355,7 @@ tkip_demic(struct ieee80211_key *k, stru
        }
        wh = (struct ieee80211_frame *) skb0->data;
        /* NB: skb left pointing at last in chain */
@@ -184,11 +174,9 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_tkip.c
                struct ieee80211vap *vap = ctx->tc_vap;
                u8 mic[IEEE80211_WEP_MICLEN];
                u8 mic0[IEEE80211_WEP_MICLEN];
-Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_wep.c
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto_wep.c
-+++ madwifi-trunk-r3314/net80211/ieee80211_crypto_wep.c
-@@ -54,7 +54,7 @@
+--- a/net80211/ieee80211_crypto_wep.c
++++ b/net80211/ieee80211_crypto_wep.c
+@@ -54,7 +54,7 @@ static int wep_setkey(struct ieee80211_k
  static int wep_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
  static int wep_decap(struct ieee80211_key *, struct sk_buff *, int);
  static int wep_enmic(struct ieee80211_key *, struct sk_buff *, int);
@@ -197,7 +185,7 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_wep.c
  
  static const struct ieee80211_cipher wep = {
        .ic_name        = "WEP",
-@@ -244,7 +244,7 @@
+@@ -244,7 +244,7 @@ wep_decap(struct ieee80211_key *k, struc
   * Verify and strip MIC from the frame.
   */
  static int
@@ -206,11 +194,9 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_wep.c
  {
        return 1;
  }
-Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c
-+++ madwifi-trunk-r3314/net80211/ieee80211_input.c
-@@ -669,7 +669,7 @@
+--- a/net80211/ieee80211_input.c
++++ b/net80211/ieee80211_input.c
+@@ -669,7 +669,7 @@ ieee80211_input(struct ieee80211vap * va
                 * Next strip any MSDU crypto bits.
                 */
                if (key != NULL &&
@@ -219,7 +205,7 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
                        IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
                                ni->ni_macaddr, "data", "%s", "demic error");
                        IEEE80211_NODE_STAT(ni, rx_demicfail);
-@@ -4293,6 +4293,47 @@
+@@ -4293,6 +4293,47 @@ ath_eth_type_trans(struct sk_buff *skb,
  }
  #endif
  
@@ -267,11 +253,9 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
  #ifdef IEEE80211_DEBUG
  /*
   * Debugging support.
-Index: madwifi-trunk-r3314/net80211/ieee80211_proto.h
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_proto.h
-+++ madwifi-trunk-r3314/net80211/ieee80211_proto.h
-@@ -90,6 +90,7 @@
+--- a/net80211/ieee80211_proto.h
++++ b/net80211/ieee80211_proto.h
+@@ -90,6 +90,7 @@ int ieee80211_iserp_rateset(struct ieee8
  void ieee80211_set11gbasicrates(struct ieee80211_rateset *, enum ieee80211_phymode);
  enum ieee80211_phymode ieee80211_get11gbasicrates(struct ieee80211_rateset *);
  void ieee80211_send_pspoll(struct ieee80211_node *);
@@ -279,11 +263,9 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_proto.h
  
  /*
   * Return the size of the 802.11 header for a management or data frame.
-Index: madwifi-trunk-r3314/net80211/ieee80211_linux.c
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_linux.c
-+++ madwifi-trunk-r3314/net80211/ieee80211_linux.c
-@@ -337,8 +337,8 @@
+--- a/net80211/ieee80211_linux.c
++++ b/net80211/ieee80211_linux.c
+@@ -337,8 +337,8 @@ ieee80211_notify_replay_failure(struct i
        /* TODO: needed parameters: count, keyid, key type, src address, TSC */
        snprintf(buf, sizeof(buf), "%s(keyid=%d %scast addr=" MAC_FMT ")", tag,
                k->wk_keyix,
@@ -294,11 +276,9 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_linux.c
        memset(&wrqu, 0, sizeof(wrqu));
        wrqu.data.length = strlen(buf);
        wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);
-Index: madwifi-trunk-r3314/net80211/ieee80211_output.c
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_output.c
-+++ madwifi-trunk-r3314/net80211/ieee80211_output.c
-@@ -1074,13 +1074,16 @@
+--- a/net80211/ieee80211_output.c
++++ b/net80211/ieee80211_output.c
+@@ -1074,13 +1074,16 @@ ieee80211_encap(struct ieee80211_node *n
                        cip = (struct ieee80211_cipher *) key->wk_cipher;
                        ciphdrsize = cip->ic_header;
                        tailsize += (cip->ic_trailer + cip->ic_miclen);
@@ -318,11 +298,9 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_output.c
  
                /*
                 * Allocate sk_buff for each subsequent fragment; First fragment
-Index: madwifi-trunk-r3314/net80211/ieee80211_node.c
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_node.c
-+++ madwifi-trunk-r3314/net80211/ieee80211_node.c
-@@ -2264,11 +2264,13 @@
+--- a/net80211/ieee80211_node.c
++++ b/net80211/ieee80211_node.c
+@@ -2264,11 +2264,13 @@ ieee80211_node_leave(struct ieee80211_no
        /* From this point onwards we can no longer find the node,
         * so no more references are generated
         */