[x86] grub: Natively build grub only on x86 linux hosts, cross compile everywhere...

[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 ff3be90..91986cd 100644 (file)
--- a/package/madwifi/patches/309-micfail_detect.patch
+++ b/package/madwifi/patches/309-micfail_detect.patch
@@ -1,15 +1,14 @@
-diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
---- madwifi.old/ath/if_ath.c   2007-06-01 11:39:53.078678000 +0200
-+++ madwifi.dev/ath/if_ath.c   2007-06-01 11:50:32.819422992 +0200
-@@ -5604,6 +5604,7 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -6446,6 +6446,7 @@
+       int type;

        u_int phyerr;
        u_int processed = 0, early_stop = 0;
        u_int phyerr;
        u_int processed = 0, early_stop = 0;

-       u_int rx_limit = dev->quota;

 +      u_int mic_fail = 0;
  
 +      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));
-@@ -5698,25 +5699,7 @@
+       DPRINTF(sc, ATH_DEBUG_RX_PROC, "invoked\n");
+ process_rx_again:
+@@ -6547,24 +6548,8 @@

                        }
                        if (rs->rs_status & HAL_RXERR_MIC) {
                                sc->sc_stats.ast_rx_badmic++;
                        }
                        if (rs->rs_status & HAL_RXERR_MIC) {
                                sc->sc_stats.ast_rx_badmic++;


@@ -18,7 +17,6 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 -                               * the 802.11 header for notification.
 -                               */
 -                              /* XXX frag's and QoS frames */
 -                               * 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,
 -                              if (len >= sizeof (struct ieee80211_frame)) {
 -                                      bus_dma_sync_single(sc->sc_bdev,
 -                                          bf->bf_skbaddr, len,


@@ -26,17 +24,18 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 -#if 0
 -/* XXX revalidate MIC, lookup ni to find VAP */
 -                                      ieee80211_notify_michael_failure(ic,
 -#if 0
 -/* XXX revalidate MIC, lookup ni to find VAP */
 -                                      ieee80211_notify_michael_failure(ic,

--                                          (struct ieee80211_frame *) skb->data,
+-                                          (struct ieee80211_frame *)skb->data,

 -                                          sc->sc_splitmic ?
 -                                              rs->rs_keyix - 32 : rs->rs_keyix
 -                                      );
 -#endif
 -                              }
 +                              mic_fail = 1;
 -                                          sc->sc_splitmic ?
 -                                              rs->rs_keyix - 32 : rs->rs_keyix
 -                                      );
 -#endif
 -                              }
 +                              mic_fail = 1;

++                              goto rx_accept;

                        }
                        /*
                        }
                        /*

-                        * Reject error frames if we have no vaps that 
-@@ -5774,8 +5757,9 @@
+                        * Reject error frames if we have no vaps that
+@@ -6603,8 +6588,9 @@

                /*
                 * Finished monitor mode handling, now reject
                 * error frames before passing to other vaps
                /*
                 * Finished monitor mode handling, now reject
                 * error frames before passing to other vaps


@@ -44,41 +43,47 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
                 */
 -              if (rs->rs_status != 0) {
 +              if (rs->rs_status & ~(HAL_RXERR_MIC | HAL_RXERR_DECRYPT)) {
                 */
 -              if (rs->rs_status != 0) {
 +              if (rs->rs_status & ~(HAL_RXERR_MIC | HAL_RXERR_DECRYPT)) {

-                       dev_kfree_skb(skb);
-                       skb = NULL;
+                       ieee80211_dev_kfree_skb(&skb);

                        goto rx_next;
                        goto rx_next;

-@@ -5806,6 +5790,27 @@
-                                  sc->sc_hwmap[rs->rs_rate].ieeerate,
-                                  rs->rs_rssi);
+               }
+@@ -6612,6 +6598,26 @@
+               /* remove the CRC */
+               skb_trim(skb, skb->len - IEEE80211_CRC_LEN);

  
  

-+              /* MIC failure. Drop the packet in any case */

 +              if (mic_fail) {
 +              if (mic_fail) {

-+                      /* Drop control frames which are reported with mic error */
-+                  if ((((struct ieee80211_frame *)skb->data)->i_fc[0] & IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_CTL) { 
-+                              dev_kfree_skb(skb);
-+                              skb = NULL;
-+                              mic_fail = 0;
-+                              goto rx_next;
-+                      }
-+                      ni = ieee80211_find_rxnode(ic, 
-+                              (const struct ieee80211_frame_min *) skb->data);
-+                      if (ni != NULL) {
++                      /* Ignore control frames which are reported with mic error */
++                  if ((((struct ieee80211_frame *)skb->data)->i_fc[0] &
++                                      IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_CTL)
++                              goto drop_micfail;
++
++                      ni = ieee80211_find_rxnode(ic, (const struct ieee80211_frame_min *) skb->data);
++
++                      if (ni && ni->ni_table) {

 +                              ieee80211_check_mic(ni, skb);
 +                              ieee80211_unref_node(&ni);
 +                      }
 +                              ieee80211_check_mic(ni, skb);
 +                              ieee80211_unref_node(&ni);
 +                      }

++
++drop_micfail:

 +                      dev_kfree_skb_any(skb);
 +                      skb = NULL;
 +                      mic_fail = 0;
 +                      goto rx_next;
 +                      dev_kfree_skb_any(skb);
 +                      skb = NULL;
 +                      mic_fail = 0;
 +                      goto rx_next;

-+              }
++              }

 +
                /*
 +
                /*

-                * Locate the node for sender, track state, and then
-                * pass the (referenced) node up to the 802.11 layer
-diff -ur madwifi.old/net80211/ieee80211_crypto_ccmp.c madwifi.dev/net80211/ieee80211_crypto_ccmp.c
---- madwifi.old/net80211/ieee80211_crypto_ccmp.c       2007-05-30 03:41:18.000000000 +0200
-+++ madwifi.dev/net80211/ieee80211_crypto_ccmp.c       2007-06-01 11:45:05.000259080 +0200
-@@ -78,7 +78,7 @@
+                * From this point on we assume the frame is at least
+                * as large as ieee80211_frame_min; verify that.
+@@ -6624,6 +6630,7 @@
+                       goto rx_next;
+               }
+ 
++              /* MIC failure. Drop the packet in any case */
+               /*
+                * Normal receive.
+                */
+--- a/net80211/ieee80211_crypto_ccmp.c
++++ b/net80211/ieee80211_crypto_ccmp.c
+@@ -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);
  static int ccmp_enmic(struct ieee80211_key *, struct sk_buff *, int);
  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);


@@ -87,7 +92,7 @@ diff -ur madwifi.old/net80211/ieee80211_crypto_ccmp.c madwifi.dev/net80211/ieee8
  
  static const struct ieee80211_cipher ccmp = {
        .ic_name        = "AES-CCM",
  
  static const struct ieee80211_cipher ccmp = {
        .ic_name        = "AES-CCM",

-@@ -298,7 +298,7 @@
+@@ -308,7 +308,7 @@

   * Verify and strip MIC from the frame.
   */
  static int
   * Verify and strip MIC from the frame.
   */
  static int


@@ -96,9 +101,8 @@ diff -ur madwifi.old/net80211/ieee80211_crypto_ccmp.c madwifi.dev/net80211/ieee8
  {
        return 1;
  }
  {
        return 1;
  }

-diff -ur madwifi.old/net80211/ieee80211_crypto.h madwifi.dev/net80211/ieee80211_crypto.h
---- madwifi.old/net80211/ieee80211_crypto.h    2007-04-16 14:32:29.000000000 +0200
-+++ madwifi.dev/net80211/ieee80211_crypto.h    2007-06-01 11:45:05.000259080 +0200
+--- a/net80211/ieee80211_crypto.h
++++ b/net80211/ieee80211_crypto.h

 @@ -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);
 @@ -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);


@@ -121,9 +125,8 @@ diff -ur madwifi.old/net80211/ieee80211_crypto.h madwifi.dev/net80211/ieee80211_
  }
  
  /*
  }
  
  /*

-diff -ur madwifi.old/net80211/ieee80211_crypto_none.c madwifi.dev/net80211/ieee80211_crypto_none.c
---- madwifi.old/net80211/ieee80211_crypto_none.c       2006-09-20 10:45:13.000000000 +0200
-+++ madwifi.dev/net80211/ieee80211_crypto_none.c       2007-06-01 11:45:05.000259080 +0200
+--- a/net80211/ieee80211_crypto_none.c
++++ b/net80211/ieee80211_crypto_none.c

 @@ -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);
 @@ -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);


@@ -142,9 +145,8 @@ diff -ur madwifi.old/net80211/ieee80211_crypto_none.c madwifi.dev/net80211/ieee8
  {
        struct ieee80211vap *vap = k->wk_private;
  
  {
        struct ieee80211vap *vap = k->wk_private;
  

-diff -ur madwifi.old/net80211/ieee80211_crypto_tkip.c madwifi.dev/net80211/ieee80211_crypto_tkip.c
---- madwifi.old/net80211/ieee80211_crypto_tkip.c       2007-05-30 03:41:18.000000000 +0200
-+++ madwifi.dev/net80211/ieee80211_crypto_tkip.c       2007-06-01 11:45:05.001258928 +0200
+--- a/net80211/ieee80211_crypto_tkip.c
++++ b/net80211/ieee80211_crypto_tkip.c

 @@ -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);
 @@ -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);


@@ -172,9 +174,8 @@ diff -ur madwifi.old/net80211/ieee80211_crypto_tkip.c madwifi.dev/net80211/ieee8
                struct ieee80211vap *vap = ctx->tc_vap;
                u8 mic[IEEE80211_WEP_MICLEN];
                u8 mic0[IEEE80211_WEP_MICLEN];
                struct ieee80211vap *vap = ctx->tc_vap;
                u8 mic[IEEE80211_WEP_MICLEN];
                u8 mic0[IEEE80211_WEP_MICLEN];

-diff -ur madwifi.old/net80211/ieee80211_crypto_wep.c madwifi.dev/net80211/ieee80211_crypto_wep.c
---- madwifi.old/net80211/ieee80211_crypto_wep.c        2007-05-29 23:55:25.000000000 +0200
-+++ madwifi.dev/net80211/ieee80211_crypto_wep.c        2007-06-01 11:45:05.001258928 +0200
+--- a/net80211/ieee80211_crypto_wep.c
++++ b/net80211/ieee80211_crypto_wep.c

 @@ -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);
 @@ -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);


@@ -193,10 +194,9 @@ diff -ur madwifi.old/net80211/ieee80211_crypto_wep.c madwifi.dev/net80211/ieee80
  {
        return 1;
  }
  {
        return 1;
  }

-diff -ur madwifi.old/net80211/ieee80211_input.c madwifi.dev/net80211/ieee80211_input.c
---- madwifi.old/net80211/ieee80211_input.c     2007-06-01 11:31:46.931583000 +0200
-+++ madwifi.dev/net80211/ieee80211_input.c     2007-06-01 11:45:05.003258624 +0200
-@@ -632,7 +632,7 @@
+--- a/net80211/ieee80211_input.c
++++ b/net80211/ieee80211_input.c
+@@ -669,7 +669,7 @@

                 * Next strip any MSDU crypto bits.
                 */
                if (key != NULL &&
                 * Next strip any MSDU crypto bits.
                 */
                if (key != NULL &&


@@ -205,12 +205,12 @@ diff -ur madwifi.old/net80211/ieee80211_input.c madwifi.dev/net80211/ieee80211_i
                        IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
                                ni->ni_macaddr, "data", "%s", "demic error");
                        IEEE80211_NODE_STAT(ni, rx_demicfail);
                        IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
                                ni->ni_macaddr, "data", "%s", "demic error");
                        IEEE80211_NODE_STAT(ni, rx_demicfail);

-@@ -3744,6 +3744,47 @@
+@@ -4293,6 +4293,47 @@

  }
  #endif
  
 +/*
  }
  #endif
  
 +/*

-+ * Process a frame w/ hw detected MIC failure. 
++ * Process a frame w/ hw detected MIC failure.

 + * The frame will be dropped in any case.
 + */
 +void
 + * The frame will be dropped in any case.
 + */
 +void


@@ -222,7 +222,7 @@ diff -ur madwifi.old/net80211/ieee80211_input.c madwifi.dev/net80211/ieee80211_i
 +      struct ieee80211_key *key;
 +      int hdrspace;
 +      struct ieee80211com *ic = vap->iv_ic;
 +      struct ieee80211_key *key;
 +      int hdrspace;
 +      struct ieee80211com *ic = vap->iv_ic;

-+      
++

 +      if (skb->len < sizeof(struct ieee80211_frame_min)) {
 +              IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 +                  ni->ni_macaddr, NULL,
 +      if (skb->len < sizeof(struct ieee80211_frame_min)) {
 +              IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 +                  ni->ni_macaddr, NULL,


@@ -232,7 +232,7 @@ diff -ur madwifi.old/net80211/ieee80211_input.c madwifi.dev/net80211/ieee80211_i
 +      }
 +
 +      wh = (struct ieee80211_frame *)skb->data;
 +      }
 +
 +      wh = (struct ieee80211_frame *)skb->data;

-+              
++

 +      hdrspace = ieee80211_hdrspace(ic, wh);
 +      key = ieee80211_crypto_decap(ni, skb, hdrspace);
 +      if (key == NULL) {
 +      hdrspace = ieee80211_hdrspace(ic, wh);
 +      key = ieee80211_crypto_decap(ni, skb, hdrspace);
 +      if (key == NULL) {


@@ -253,10 +253,9 @@ diff -ur madwifi.old/net80211/ieee80211_input.c madwifi.dev/net80211/ieee80211_i
  #ifdef IEEE80211_DEBUG
  /*
   * Debugging support.
  #ifdef IEEE80211_DEBUG
  /*
   * Debugging support.

-diff -ur madwifi.old/net80211/ieee80211_proto.h madwifi.dev/net80211/ieee80211_proto.h
---- madwifi.old/net80211/ieee80211_proto.h     2007-06-01 11:26:04.172691000 +0200
-+++ madwifi.dev/net80211/ieee80211_proto.h     2007-06-01 11:45:05.004258472 +0200
-@@ -91,6 +91,7 @@
+--- a/net80211/ieee80211_proto.h
++++ b/net80211/ieee80211_proto.h
+@@ -90,6 +90,7 @@

  void ieee80211_set11gbasicrates(struct ieee80211_rateset *, enum ieee80211_phymode);
  enum ieee80211_phymode ieee80211_get11gbasicrates(struct ieee80211_rateset *);
  void ieee80211_send_pspoll(struct ieee80211_node *);
  void ieee80211_set11gbasicrates(struct ieee80211_rateset *, enum ieee80211_phymode);
  enum ieee80211_phymode ieee80211_get11gbasicrates(struct ieee80211_rateset *);
  void ieee80211_send_pspoll(struct ieee80211_node *);


@@ -264,16 +263,59 @@ diff -ur madwifi.old/net80211/ieee80211_proto.h madwifi.dev/net80211/ieee80211_p
  
  /*
   * Return the size of the 802.11 header for a management or data frame.
  
  /*
   * Return the size of the 802.11 header for a management or data frame.

---- madwifi.old/net80211/ieee80211_linux.c     2007-06-02 04:05:42.902538336 +0200
-+++ madwifi.dev/net80211/ieee80211_linux.c     2007-06-02 04:05:55.302653232 +0200
-@@ -291,8 +291,8 @@
+--- a/net80211/ieee80211_linux.c
++++ b/net80211/ieee80211_linux.c
+@@ -337,8 +337,8 @@

        /* TODO: needed parameters: count, keyid, key type, src address, TSC */
        /* TODO: needed parameters: count, keyid, key type, src address, TSC */

-       snprintf(buf, sizeof(buf), "%s(keyid=%d %scast addr=%s)", tag,
+       snprintf(buf, sizeof(buf), "%s(keyid=%d %scast addr=" MAC_FMT ")", tag,

                k->wk_keyix,
 -              IEEE80211_IS_MULTICAST(wh->i_addr1) ?  "broad" : "uni",
                k->wk_keyix,
 -              IEEE80211_IS_MULTICAST(wh->i_addr1) ?  "broad" : "uni",

--              ether_sprintf(wh->i_addr1));
+-              MAC_ADDR(wh->i_addr1));

 +              IEEE80211_IS_MULTICAST(wh->i_addr2) ?  "broad" : "uni",
 +              IEEE80211_IS_MULTICAST(wh->i_addr2) ?  "broad" : "uni",

-+              ether_sprintf(wh->i_addr2));
++              MAC_ADDR(wh->i_addr2));

        memset(&wrqu, 0, sizeof(wrqu));
        wrqu.data.length = strlen(buf);
        wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);
        memset(&wrqu, 0, sizeof(wrqu));
        wrqu.data.length = strlen(buf);
        wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);

+--- a/net80211/ieee80211_output.c
++++ b/net80211/ieee80211_output.c
+@@ -1074,13 +1074,16 @@
+                       cip = (struct ieee80211_cipher *) key->wk_cipher;
+                       ciphdrsize = cip->ic_header;
+                       tailsize += (cip->ic_trailer + cip->ic_miclen);
++
++                      /* add the 8 bytes MIC length */
++                      if (cip->ic_cipher == IEEE80211_CIPHER_TKIP)
++                              pktlen += IEEE80211_WEP_MICLEN;
+               }
+ 
+               pdusize = vap->iv_fragthreshold - (hdrsize_nopad + ciphdrsize);
+               fragcnt = *framecnt =
+-                      ((pktlen - (hdrsize_nopad + ciphdrsize)) / pdusize) +
+-                      (((pktlen - (hdrsize_nopad + ciphdrsize)) %
+-                              pdusize == 0) ? 0 : 1);
++                      ((pktlen - hdrsize_nopad) / pdusize) +
++                      (((pktlen - hdrsize_nopad) % pdusize == 0) ? 0 : 1);
+ 
+               /*
+                * Allocate sk_buff for each subsequent fragment; First fragment
+--- a/net80211/ieee80211_node.c
++++ b/net80211/ieee80211_node.c
+@@ -2264,11 +2264,13 @@
+       /* From this point onwards we can no longer find the node,
+        * so no more references are generated
+        */
+-      ieee80211_remove_wds_addr(nt, ni->ni_macaddr);
+-      ieee80211_del_wds_node(nt, ni);
+-      IEEE80211_NODE_TABLE_LOCK_IRQ(nt);
+-      node_table_leave_locked(nt, ni);
+-      IEEE80211_NODE_TABLE_UNLOCK_IRQ(nt);
++      if (nt) {
++              ieee80211_remove_wds_addr(nt, ni->ni_macaddr);
++              ieee80211_del_wds_node(nt, ni);
++              IEEE80211_NODE_TABLE_LOCK_IRQ(nt);
++              node_table_leave_locked(nt, ni);
++              IEEE80211_NODE_TABLE_UNLOCK_IRQ(nt);
++      }
+ 
+       /*
+        * If node wasn't previously associated all