mt76: update to the latest version
authorFelix Fietkau <nbd@nbd.name>
Thu, 12 Oct 2017 11:39:40 +0000 (13:39 +0200)
committerFelix Fietkau <nbd@nbd.name>
Fri, 13 Oct 2017 09:45:57 +0000 (11:45 +0200)
e781569 update to latest mac80211/cfg80211 API changes
37654d7 mt76x2: fix tx status ampdu length corner case

Signed-off-by: Felix Fietkau <nbd@nbd.name>
package/kernel/mt76/Makefile
package/kernel/mt76/patches/001-mac80211-4-14-api.patch [deleted file]

index 01b5f52865cc118adcec2c6724bcb7a8d8d0f30b..3428ea1f782610f769dc0c7cd353e9683a215fc9 100644 (file)
@@ -8,9 +8,9 @@ PKG_LICENSE_FILES:=
 
 PKG_SOURCE_URL:=https://github.com/openwrt/mt76
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2017-09-10
-PKG_SOURCE_VERSION:=d5e945e9b2ee8f52581c1a6978097cf30c39cfd9
-PKG_MIRROR_HASH:=276eb2eea7b5ae64424292c5d955a8543fd3e39a2125b8046a30a519be76f3c9
+PKG_SOURCE_DATE:=2017-10-12
+PKG_SOURCE_VERSION:=37654d704772512065cd28b007342758c2a0f14a
+PKG_MIRROR_HASH:=487ca40ed4e1ffe015dabc76c0a84782602d84f5b08c9c86cc6c892cb499623b
 
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_BUILD_PARALLEL:=1
diff --git a/package/kernel/mt76/patches/001-mac80211-4-14-api.patch b/package/kernel/mt76/patches/001-mac80211-4-14-api.patch
deleted file mode 100644 (file)
index 6cff15b..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
---- a/mt76x2_mac.c
-+++ b/mt76x2_mac.c
-@@ -46,7 +46,7 @@ mt76x2_mac_process_rate(struct ieee80211
-       case MT_PHY_TYPE_CCK:
-               if (idx >= 8) {
-                       idx -= 8;
--                      status->flag |= RX_FLAG_SHORTPRE;
-+                      status->enc_flags |= RX_ENC_FLAG_SHORTPRE;
-               }
-               if (idx >= 4)
-@@ -55,16 +55,16 @@ mt76x2_mac_process_rate(struct ieee80211
-               status->rate_idx = idx;
-               return;
-       case MT_PHY_TYPE_HT_GF:
--              status->flag |= RX_FLAG_HT_GF;
-+              status->enc_flags |= RX_ENC_FLAG_HT_GF;
-               /* fall through */
-       case MT_PHY_TYPE_HT:
--              status->flag |= RX_FLAG_HT;
-+              status->encoding = RX_ENC_HT;
-               status->rate_idx = idx;
-               break;
-       case MT_PHY_TYPE_VHT:
--              status->flag |= RX_FLAG_VHT;
-+              status->encoding = RX_ENC_VHT;
-               status->rate_idx = FIELD_GET(MT_RATE_INDEX_VHT_IDX, idx);
--              status->vht_nss = FIELD_GET(MT_RATE_INDEX_VHT_NSS, idx) + 1;
-+              status->nss = FIELD_GET(MT_RATE_INDEX_VHT_NSS, idx) + 1;
-               break;
-       default:
-               WARN_ON(1);
-@@ -72,22 +72,22 @@ mt76x2_mac_process_rate(struct ieee80211
-       }
-       if (rate & MT_RXWI_RATE_LDPC)
--              status->flag |= RX_FLAG_LDPC;
-+              status->enc_flags |= RX_ENC_FLAG_LDPC;
-       if (rate & MT_RXWI_RATE_SGI)
--              status->flag |= RX_FLAG_SHORT_GI;
-+              status->enc_flags |= RX_ENC_FLAG_SHORT_GI;
-       if (rate & MT_RXWI_RATE_STBC)
--              status->flag |= 1 << RX_FLAG_STBC_SHIFT;
-+              status->enc_flags |= 1 << RX_ENC_FLAG_STBC_SHIFT;
-       switch (FIELD_GET(MT_RXWI_RATE_BW, rate)) {
-       case MT_PHY_BW_20:
-               break;
-       case MT_PHY_BW_40:
--              status->flag |= RX_FLAG_40MHZ;
-+              status->bw = RATE_INFO_BW_40;
-               break;
-       case MT_PHY_BW_80:
--              status->vht_flag |= RX_VHT_FLAG_80MHZ;
-+              status->bw = RATE_INFO_BW_80;
-               break;
-       default:
-               break;
---- a/mt7603_mac.c
-+++ b/mt7603_mac.c
-@@ -411,19 +411,19 @@ mt7603_mac_fill_rx(struct mt7603_dev *de
-                       break;
-               case MT_PHY_TYPE_HT_GF:
-               case MT_PHY_TYPE_HT:
--                      status->flag |= RX_FLAG_HT;
-+                      status->encoding = RX_ENC_HT;
-                       break;
-               case MT_PHY_TYPE_VHT:
--                      status->flag |= RX_FLAG_VHT;
-+                      status->encoding = RX_ENC_VHT;
-                       break;
-               default:
-                       WARN_ON(1);
-               }
-               if (rxdg0 & MT_RXV1_HT_SHORT_GI)
--                      status->flag |= RX_FLAG_SHORT_GI;
-+                      status->enc_flags |= RX_ENC_FLAG_SHORT_GI;
--              status->flag |= RX_FLAG_STBC_MASK *
-+              status->enc_flags |= RX_ENC_FLAG_STBC_MASK *
-                                   FIELD_GET(MT_RXV1_HT_STBC, rxdg0);
-               status->rate_idx = i;