fixes download path for mac80211

[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 ee5698f..e184a4e 100644 (file)
--- a/package/madwifi/patches/309-micfail_detect.patch
+++ b/package/madwifi/patches/309-micfail_detect.patch
@@ -1,16 +1,14 @@
-Index: madwifi-ng-r2568-20070710/ath/if_ath.c
-===================================================================
---- madwifi-ng-r2568-20070710.orig/ath/if_ath.c        2007-07-23 01:48:46.026603077 +0200
-+++ madwifi-ng-r2568-20070710/ath/if_ath.c     2007-07-23 01:48:46.310619260 +0200
-@@ -5632,6 +5632,7 @@
-       u_int64_t rs_tsf;
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -6459,6 +6459,7 @@
+       int type;
+       u_int phyerr;

        u_int processed = 0, early_stop = 0;
        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));
-@@ -5726,25 +5727,7 @@
+       DPRINTF(sc, ATH_DEBUG_RX_PROC, "invoked\n");
+ process_rx_again:
+@@ -6560,24 +6561,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++;


@@ -19,7 +17,6 @@ Index: madwifi-ng-r2568-20070710/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,


@@ -27,17 +24,18 @@ Index: madwifi-ng-r2568-20070710/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 
-@@ -5809,8 +5792,9 @@
+                        * Reject error frames if we have no vaps that
+@@ -6616,8 +6601,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


@@ -45,14 +43,13 @@ Index: madwifi-ng-r2568-20070710/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;

-@@ -5841,6 +5825,27 @@
-                                  sc->sc_hwmap[rs->rs_rate].ieeerate,
-                                  rs->rs_rssi);
+               }
+@@ -6625,6 +6611,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] &
 +              if (mic_fail) {
 +                      /* Ignore control frames which are reported with mic error */
 +                  if ((((struct ieee80211_frame *)skb->data)->i_fc[0] &


@@ -71,15 +68,21 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c
 +                      skb = NULL;
 +                      mic_fail = 0;
 +                      goto rx_next;
 +                      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
-Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_ccmp.c
-===================================================================
---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_ccmp.c    2007-07-23 01:48:42.870423216 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_ccmp.c 2007-07-23 01:48:46.310619260 +0200
+                * From this point on we assume the frame is at least
+                * as large as ieee80211_frame_min; verify that.
+@@ -6637,6 +6643,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);
 @@ -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 +101,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_ccmp.c
  {
        return 1;
  }
  {
        return 1;
  }

-Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto.h
-===================================================================
---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto.h 2007-07-23 01:48:36.806077628 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto.h      2007-07-23 01:48:46.326620171 +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);


@@ -124,10 +125,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto.h
  }
  
  /*
  }
  
  /*

-Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_none.c
-===================================================================
---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_none.c    2007-07-23 01:48:36.810077857 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_none.c 2007-07-23 01:48:46.342621086 +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);


@@ -146,10 +145,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_none.c
  {
        struct ieee80211vap *vap = k->wk_private;
  
  {
        struct ieee80211vap *vap = k->wk_private;
  

-Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_tkip.c
-===================================================================
---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_tkip.c    2007-07-23 01:48:36.818078312 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_tkip.c 2007-07-23 01:48:46.362622225 +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);


@@ -177,10 +174,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_tkip.c
                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];

-Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_wep.c
-===================================================================
---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_wep.c     2007-07-23 01:48:36.826078768 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_wep.c  2007-07-23 01:48:46.402624504 +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);


@@ -199,11 +194,9 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_wep.c
  {
        return 1;
  }
  {
        return 1;
  }

-Index: madwifi-ng-r2568-20070710/net80211/ieee80211_input.c
-===================================================================
---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_input.c  2007-07-23 01:48:45.690583928 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_input.c       2007-07-23 01:48:46.406624734 +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 &&


@@ -212,7 +205,7 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_input.c
                        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);

-@@ -3772,6 +3772,47 @@
+@@ -4293,6 +4293,47 @@

  }
  #endif
  
  }
  #endif
  


@@ -260,11 +253,9 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_input.c
  #ifdef IEEE80211_DEBUG
  /*
   * Debugging support.
  #ifdef IEEE80211_DEBUG
  /*
   * Debugging support.

-Index: madwifi-ng-r2568-20070710/net80211/ieee80211_proto.h
-===================================================================
---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_proto.h  2007-07-23 01:48:36.838079452 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_proto.h       2007-07-23 01:48:46.438626555 +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 *);


@@ -272,26 +263,22 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_proto.h
  
  /*
   * 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.

-Index: madwifi-ng-r2568-20070710/net80211/ieee80211_linux.c
-===================================================================
---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_linux.c  2007-07-23 01:48:42.626409310 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_linux.c       2007-07-23 01:48:46.462627924 +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);

-Index: madwifi-ng-r2568-20070710/net80211/ieee80211_output.c
-===================================================================
---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_output.c 2007-07-23 01:48:36.854080363 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_output.c      2007-07-23 01:48:46.466628154 +0200
-@@ -1079,13 +1079,16 @@
+--- 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);
                        cip = (struct ieee80211_cipher *) key->wk_cipher;
                        ciphdrsize = cip->ic_header;
                        tailsize += (cip->ic_trailer + cip->ic_miclen);


@@ -311,24 +298,22 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_output.c
  
                /*
                 * Allocate sk_buff for each subsequent fragment; First fragment
  
                /*
                 * Allocate sk_buff for each subsequent fragment; First fragment

-Index: madwifi-ng-r2568-20070710/net80211/ieee80211_node.c
-===================================================================
---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_node.c   2007-07-23 01:48:45.694584154 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_node.c        2007-07-23 01:48:46.590635219 +0200
-@@ -1891,11 +1891,13 @@
+--- 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);
        /* 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(nt, ni);
+-      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);
 -      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(nt, ni);
++              node_table_leave_locked(nt, ni);

 +              IEEE80211_NODE_TABLE_UNLOCK_IRQ(nt);
 +      }
  
 +              IEEE80211_NODE_TABLE_UNLOCK_IRQ(nt);
 +      }