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

[openwrt.git] / package / madwifi / patches / 405-retransmit_check.patch

diff --git a/package/madwifi/patches/405-retransmit_check.patch b/package/madwifi/patches/405-retransmit_check.patch
index c20a022..11e78ab 100644 (file)
--- a/package/madwifi/patches/405-retransmit_check.patch
+++ b/package/madwifi/patches/405-retransmit_check.patch
@@ -1,8 +1,6 @@
-Index: madwifi-trunk-r3314/net80211/ieee80211.h
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211.h      2008-07-01 22:16:19.000000000 +0200
-+++ madwifi-trunk-r3314/net80211/ieee80211.h   2008-07-01 22:17:12.000000000 +0200
-@@ -174,8 +174,6 @@
+--- a/net80211/ieee80211.h
++++ b/net80211/ieee80211.h
+@@ -174,8 +174,6 @@ struct ieee80211_ctlframe_addr2 {

  #define       IEEE80211_SEQ_SEQ_MASK                  0xfff0
  #define       IEEE80211_SEQ_SEQ_SHIFT                 4
  
  #define       IEEE80211_SEQ_SEQ_MASK                  0xfff0
  #define       IEEE80211_SEQ_SEQ_SHIFT                 4
  


@@ -11,11 +9,9 @@ Index: madwifi-trunk-r3314/net80211/ieee80211.h
  #define       IEEE80211_NWID_LEN                      32
  
  #define       IEEE80211_QOS_TXOP                      0x00ff
  #define       IEEE80211_NWID_LEN                      32
  
  #define       IEEE80211_QOS_TXOP                      0x00ff

-Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c        2008-07-01 22:17:11.000000000 +0200
-+++ madwifi-trunk-r3314/net80211/ieee80211_input.c     2008-07-01 22:17:49.000000000 +0200
-@@ -412,7 +412,7 @@
+--- a/net80211/ieee80211_input.c
++++ b/net80211/ieee80211_input.c
+@@ -428,7 +428,7 @@ ieee80211_input(struct ieee80211vap * va

                                tid = 0;
                        rxseq = le16toh(*(__le16 *)wh->i_seq);
                        if ((wh->i_fc[1] & IEEE80211_FC1_RETRY) &&
                                tid = 0;
                        rxseq = le16toh(*(__le16 *)wh->i_seq);
                        if ((wh->i_fc[1] & IEEE80211_FC1_RETRY) &&