From 9269f6541473283fd43b5e27acce6f2177b859aa Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Thu, 26 Nov 2015 14:08:37 +0000 Subject: [PATCH] mwlwifi: update to latest version Signed-off-by: Imre Kaloz SVN-Revision: 47661 --- package/kernel/mwlwifi/Makefile | 4 +- .../mwlwifi/patches/100-drop_old_api.patch | 64 +++++++++++++++++-- .../mwlwifi/patches/110-ampdu_api.patch | 11 ---- 3 files changed, 62 insertions(+), 17 deletions(-) delete mode 100644 package/kernel/mwlwifi/patches/110-ampdu_api.patch diff --git a/package/kernel/mwlwifi/Makefile b/package/kernel/mwlwifi/Makefile index bec27328bece..73e178bcea74 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.12-20151029 +PKG_VERSION:=10.3.0.14-20151126 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:=30e6b06de659f1d5e46d1dd3bf590caf3529bb65 +PKG_SOURCE_VERSION:=6a147a2fbe07c2ac45b593d9f8227539fefb84e8 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz PKG_MAINTAINER:=Imre Kaloz diff --git a/package/kernel/mwlwifi/patches/100-drop_old_api.patch b/package/kernel/mwlwifi/patches/100-drop_old_api.patch index 1ab161544d9b..d2e149e9a211 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 -@@ -414,11 +414,7 @@ static void mwl_set_ht_caps(struct mwl_p +@@ -418,11 +418,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; -@@ -520,21 +516,13 @@ static int mwl_wl_init(struct mwl_priv * +@@ -524,29 +520,16 @@ static int mwl_wl_init(struct mwl_priv * hw->queues = SYSADPT_TX_WMM_QUEUES; /* Set rssi values to dBm */ @@ -32,5 +32,61 @@ ieee80211_hw_set(hw, AP_LINK_PS); -#endif - hw->vif_data_size = sizeof(struct mwl_vif); - hw->sta_data_size = sizeof(struct mwl_sta); +-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0) +- hw->flags |= IEEE80211_HW_SUPPORTS_PER_STA_GTK | +- IEEE80211_HW_MFP_CAPABLE; +-#else + ieee80211_hw_set(hw, SUPPORTS_PER_STA_GTK); + ieee80211_hw_set(hw, MFP_CAPABLE); +-#endif + + hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN; + +--- a/dev.h ++++ b/dev.h +@@ -484,10 +484,6 @@ static inline struct mwl_sta *mwl_dev_ge + return (struct mwl_sta *)&sta->drv_priv; + } + +-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) +-#define ether_addr_copy(dst, src) memcpy(dst, src, ETH_ALEN) +-#endif +- + /* Defined in mac80211.c. */ + extern const struct ieee80211_ops mwl_mac80211_ops; + +--- a/mac80211.c ++++ b/mac80211.c +@@ -572,19 +572,11 @@ static int mwl_mac80211_get_survey(struc + return 0; + } + +-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) +-static int mwl_mac80211_ampdu_action(struct ieee80211_hw *hw, +- struct ieee80211_vif *vif, +- enum ieee80211_ampdu_mlme_action action, +- struct ieee80211_sta *sta, +- u16 tid, u16 *ssn, u8 buf_size) +-#else + static int mwl_mac80211_ampdu_action(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + enum ieee80211_ampdu_mlme_action action, + struct ieee80211_sta *sta, + u16 tid, u16 *ssn, u8 buf_size, bool amsdu) +-#endif + { + int rc = 0; + struct mwl_priv *priv = hw->priv; +--- a/rx.c ++++ b/rx.c +@@ -232,10 +232,8 @@ static inline void mwl_rx_prepare_status + status->flag |= RX_FLAG_VHT; + if (bw == RX_RATE_INFO_HT40) + status->flag |= RX_FLAG_40MHZ; +-#if LINUX_VERSION_CODE > KERNEL_VERSION(3, 18, 0) + if (bw == RX_RATE_INFO_HT80) + status->vht_flag |= RX_VHT_FLAG_80MHZ; +-#endif + if (gi == RX_RATE_INFO_SHORT_INTERVAL) + status->flag |= RX_FLAG_SHORT_GI; + status->vht_nss = (nss + 1); diff --git a/package/kernel/mwlwifi/patches/110-ampdu_api.patch b/package/kernel/mwlwifi/patches/110-ampdu_api.patch deleted file mode 100644 index 5e52b0984122..000000000000 --- a/package/kernel/mwlwifi/patches/110-ampdu_api.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/mac80211.c -+++ b/mac80211.c -@@ -574,7 +574,7 @@ static int mwl_mac80211_ampdu_action(str - struct ieee80211_vif *vif, - enum ieee80211_ampdu_mlme_action action, - struct ieee80211_sta *sta, -- u16 tid, u16 *ssn, u8 buf_size) -+ u16 tid, u16 *ssn, u8 buf_size, bool amsdu) - { - int rc = 0; - struct mwl_priv *priv = hw->priv; -- 2.30.2