aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'package/kernel')
-rw-r--r--package/kernel/mt76/Makefile4
-rw-r--r--package/kernel/mt76/patches/0001-mt7602-remove-vht-capabilities.patch46
2 files changed, 2 insertions, 48 deletions
diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
index fb2c995b63..e35f6e2843 100644
--- a/package/kernel/mt76/Makefile
+++ b/package/kernel/mt76/Makefile
@@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=mt76
-PKG_VERSION:=2014-12-10
+PKG_VERSION:=2015-02-11
PKG_RELEASE=1
PKG_LICENSE:=GPLv2
@@ -10,7 +10,7 @@ PKG_LICENSE_FILES:=
PKG_SOURCE_URL:=https://github.com/openwrt/mt76
PKG_SOURCE_PROTO:=git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=83d0a1a12a9055569cde5786d1304c83d2d9bc0a
+PKG_SOURCE_VERSION:=dddcd8d9cce08c5d0fbe1bd1586bc03b071bc199
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
diff --git a/package/kernel/mt76/patches/0001-mt7602-remove-vht-capabilities.patch b/package/kernel/mt76/patches/0001-mt7602-remove-vht-capabilities.patch
deleted file mode 100644
index 0a1f9c9862..0000000000
--- a/package/kernel/mt76/patches/0001-mt7602-remove-vht-capabilities.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/init.c
-+++ b/init.c
-@@ -682,24 +682,27 @@ mt76_init_sband(struct mt76_dev *dev, st
- ht_cap->ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K;
- ht_cap->ampdu_density = IEEE80211_HT_MPDU_DENSITY_4;
-
-- vht_cap = &sband->vht_cap;
-- vht_cap->vht_supported = true;
-+ if (dev->cap.has_5ghz)
-+ {
-+ vht_cap = &sband->vht_cap;
-+ vht_cap->vht_supported = true;
-
-- mcs_map = (IEEE80211_VHT_MCS_SUPPORT_0_9 << (0 * 2)) |
-- (IEEE80211_VHT_MCS_SUPPORT_0_9 << (1 * 2)) |
-- (IEEE80211_VHT_MCS_NOT_SUPPORTED << (2 * 2)) |
-- (IEEE80211_VHT_MCS_NOT_SUPPORTED << (3 * 2)) |
-- (IEEE80211_VHT_MCS_NOT_SUPPORTED << (4 * 2)) |
-- (IEEE80211_VHT_MCS_NOT_SUPPORTED << (5 * 2)) |
-- (IEEE80211_VHT_MCS_NOT_SUPPORTED << (6 * 2)) |
-- (IEEE80211_VHT_MCS_NOT_SUPPORTED << (7 * 2));
-+ mcs_map = (IEEE80211_VHT_MCS_SUPPORT_0_9 << (0 * 2)) |
-+ (IEEE80211_VHT_MCS_SUPPORT_0_9 << (1 * 2)) |
-+ (IEEE80211_VHT_MCS_NOT_SUPPORTED << (2 * 2)) |
-+ (IEEE80211_VHT_MCS_NOT_SUPPORTED << (3 * 2)) |
-+ (IEEE80211_VHT_MCS_NOT_SUPPORTED << (4 * 2)) |
-+ (IEEE80211_VHT_MCS_NOT_SUPPORTED << (5 * 2)) |
-+ (IEEE80211_VHT_MCS_NOT_SUPPORTED << (6 * 2)) |
-+ (IEEE80211_VHT_MCS_NOT_SUPPORTED << (7 * 2));
-
-- vht_cap->vht_mcs.rx_mcs_map = cpu_to_le16(mcs_map);
-- vht_cap->vht_mcs.tx_mcs_map = cpu_to_le16(mcs_map);
-- vht_cap->cap = IEEE80211_VHT_CAP_RXLDPC |
-- IEEE80211_VHT_CAP_TXSTBC |
-- IEEE80211_VHT_CAP_RXSTBC_1 |
-- IEEE80211_VHT_CAP_SHORT_GI_80;
-+ vht_cap->vht_mcs.rx_mcs_map = cpu_to_le16(mcs_map);
-+ vht_cap->vht_mcs.tx_mcs_map = cpu_to_le16(mcs_map);
-+ vht_cap->cap = IEEE80211_VHT_CAP_RXLDPC |
-+ IEEE80211_VHT_CAP_TXSTBC |
-+ IEEE80211_VHT_CAP_RXSTBC_1 |
-+ IEEE80211_VHT_CAP_SHORT_GI_80;
-+ }
-
- dev->chandef.chan = &sband->channels[0];
-