diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2015-11-26 14:08:37 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2015-11-26 14:08:37 +0000 |
| commit | 9269f6541473283fd43b5e27acce6f2177b859aa (patch) | |
| tree | 21e32609fce9bf0f25164853b7075c6b72e5ff62 /package/kernel/mwlwifi/patches/100-drop_old_api.patch | |
| parent | 0e0119b6f0f90461b8924507ae38a3201900c3e3 (diff) | |
| download | master-31e0f0ae-9269f6541473283fd43b5e27acce6f2177b859aa.tar.gz master-31e0f0ae-9269f6541473283fd43b5e27acce6f2177b859aa.tar.bz2 master-31e0f0ae-9269f6541473283fd43b5e27acce6f2177b859aa.zip | |
mwlwifi: update to latest version
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 47661
Diffstat (limited to 'package/kernel/mwlwifi/patches/100-drop_old_api.patch')
| -rw-r--r-- | package/kernel/mwlwifi/patches/100-drop_old_api.patch | 64 |
1 files changed, 60 insertions, 4 deletions
diff --git a/package/kernel/mwlwifi/patches/100-drop_old_api.patch b/package/kernel/mwlwifi/patches/100-drop_old_api.patch index 1ab161544d..d2e149e9a2 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); |