aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-05-21 17:47:20 +0200
committerFelix Fietkau <nbd@nbd.name>2016-05-21 18:08:29 +0200
commitab5e07f73107834192c4dc5826b7d8775d2aae1b (patch)
treec048cd02bbdc2b5e1a2615b9e1b50b63b9a4ef77 /package/kernel
parentf0dd81043cc2d6555c1e686365db8e1f48732acf (diff)
downloadupstream-ab5e07f73107834192c4dc5826b7d8775d2aae1b.tar.gz
upstream-ab5e07f73107834192c4dc5826b7d8775d2aae1b.tar.bz2
upstream-ab5e07f73107834192c4dc5826b7d8775d2aae1b.zip
mwlwifi: update to 10.3.0.17-20160520-1
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel')
-rw-r--r--package/kernel/mwlwifi/Makefile4
-rw-r--r--package/kernel/mwlwifi/patches/100-drop_old_api.patch10
2 files changed, 7 insertions, 7 deletions
diff --git a/package/kernel/mwlwifi/Makefile b/package/kernel/mwlwifi/Makefile
index 074104b913..6a59a024fa 100644
--- a/package/kernel/mwlwifi/Makefile
+++ b/package/kernel/mwlwifi/Makefile
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=mwlwifi
-PKG_VERSION:=10.3.0.17-20160324
+PKG_VERSION:=10.3.0.17-20160520-1
PKG_RELEASE=1
PKG_LICENSE:=ISC
@@ -17,7 +17,7 @@ PKG_LICENSE_FILES:=
PKG_SOURCE_URL:=https://github.com/kaloz/mwlwifi
PKG_SOURCE_PROTO:=git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=6988b67d9af987a7ba47f82cdaa6c9107e55ec3f
+PKG_SOURCE_VERSION:=7d49296d12b44025278a52c5a26fb1b4236f320f
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
PKG_MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
diff --git a/package/kernel/mwlwifi/patches/100-drop_old_api.patch b/package/kernel/mwlwifi/patches/100-drop_old_api.patch
index d2e149e9a2..086edeb0b4 100644
--- a/package/kernel/mwlwifi/patches/100-drop_old_api.patch
+++ b/package/kernel/mwlwifi/patches/100-drop_old_api.patch
@@ -1,6 +1,6 @@
--- a/main.c
+++ b/main.c
-@@ -418,11 +418,7 @@ static void mwl_set_ht_caps(struct mwl_p
+@@ -423,11 +423,7 @@ static void mwl_set_ht_caps(struct mwl_p
band->ht_cap.cap |= IEEE80211_HT_CAP_SGI_20;
band->ht_cap.cap |= IEEE80211_HT_CAP_SGI_40;
@@ -12,7 +12,7 @@
band->ht_cap.ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K;
band->ht_cap.ampdu_density = IEEE80211_HT_MPDU_DENSITY_4;
-@@ -524,29 +520,16 @@ static int mwl_wl_init(struct mwl_priv *
+@@ -563,29 +559,16 @@ static int mwl_wl_init(struct mwl_priv *
hw->queues = SYSADPT_TX_WMM_QUEUES;
/* Set rssi values to dBm */
@@ -41,10 +41,10 @@
-#endif
hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
-
+ hw->wiphy->flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH;
--- a/dev.h
+++ b/dev.h
-@@ -484,10 +484,6 @@ static inline struct mwl_sta *mwl_dev_ge
+@@ -506,10 +506,6 @@ static inline struct mwl_sta *mwl_dev_ge
return (struct mwl_sta *)&sta->drv_priv;
}
@@ -57,7 +57,7 @@
--- a/mac80211.c
+++ b/mac80211.c
-@@ -572,19 +572,11 @@ static int mwl_mac80211_get_survey(struc
+@@ -598,19 +598,11 @@ static int mwl_mac80211_get_survey(struc
return 0;
}