madwifi: add some extra sanity checking

[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 23da333..e184a4e 100644 (file)
--- a/package/madwifi/patches/309-micfail_detect.patch
+++ b/package/madwifi/patches/309-micfail_detect.patch
@@ -1,6 +1,6 @@
 --- a/ath/if_ath.c
 +++ b/ath/if_ath.c
 --- a/ath/if_ath.c
 +++ b/ath/if_ath.c

-@@ -6456,6 +6456,7 @@
+@@ -6459,6 +6459,7 @@

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


@@ -8,7 +8,7 @@
  
        DPRINTF(sc, ATH_DEBUG_RX_PROC, "invoked\n");
  process_rx_again:
  
        DPRINTF(sc, ATH_DEBUG_RX_PROC, "invoked\n");
  process_rx_again:

-@@ -6557,24 +6558,8 @@
+@@ -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++;


@@ -35,7 +35,7 @@
                        }
                        /*
                         * Reject error frames if we have no vaps that
                        }
                        /*
                         * Reject error frames if we have no vaps that

-@@ -6613,8 +6598,9 @@
+@@ -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


@@ -46,7 +46,7 @@
                        ieee80211_dev_kfree_skb(&skb);
                        goto rx_next;
                }
                        ieee80211_dev_kfree_skb(&skb);
                        goto rx_next;
                }

-@@ -6622,6 +6608,26 @@
+@@ -6625,6 +6611,26 @@

                /* remove the CRC */
                skb_trim(skb, skb->len - IEEE80211_CRC_LEN);
  
                /* remove the CRC */
                skb_trim(skb, skb->len - IEEE80211_CRC_LEN);
  


@@ -73,7 +73,7 @@
                /*
                 * From this point on we assume the frame is at least
                 * as large as ieee80211_frame_min; verify that.
                /*
                 * From this point on we assume the frame is at least
                 * as large as ieee80211_frame_min; verify that.

-@@ -6634,6 +6640,7 @@
+@@ -6637,6 +6643,7 @@

                        goto rx_next;
                }
  
                        goto rx_next;
                }