aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-07-07 22:07:22 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-07-07 22:07:22 +0000
commit1ef0bc6bfb5bb5f4189bf118ceaac5e0144c57ad (patch)
tree608e849a96c992eb0f15ff3f7f2a8ef06cfe5725
parent4014ba376c685bb151324183b64d01cd523aed63 (diff)
downloadupstream-1ef0bc6bfb5bb5f4189bf118ceaac5e0144c57ad.tar.gz
upstream-1ef0bc6bfb5bb5f4189bf118ceaac5e0144c57ad.tar.bz2
upstream-1ef0bc6bfb5bb5f4189bf118ceaac5e0144c57ad.zip
mwlwifi: fix compile error after mac80211 update
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 46254
-rw-r--r--package/kernel/mwlwifi/patches/100-api_update.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/package/kernel/mwlwifi/patches/100-api_update.patch b/package/kernel/mwlwifi/patches/100-api_update.patch
new file mode 100644
index 0000000000..09d65d2df3
--- /dev/null
+++ b/package/kernel/mwlwifi/patches/100-api_update.patch
@@ -0,0 +1,27 @@
+--- a/main.c
++++ b/main.c
+@@ -476,7 +476,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;
+
+- hw->flags |= IEEE80211_HW_AMPDU_AGGREGATION;
++ ieee80211_hw_set(hw, AMPDU_AGGREGATION);
+ band->ht_cap.ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K;
+ band->ht_cap.ampdu_density = IEEE80211_HT_MPDU_DENSITY_4;
+
+@@ -578,12 +578,13 @@ static int mwl_wl_init(struct mwl_priv *
+ hw->queues = SYSADPT_TX_WMM_QUEUES;
+
+ /* Set rssi values to dBm */
+- hw->flags |= IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_HAS_RATE_CONTROL;
++ ieee80211_hw_set(hw, SIGNAL_DBM);
++ ieee80211_hw_set(hw, HAS_RATE_CONTROL);
+
+ /* Ask mac80211 to not to trigger PS mode
+ * based on PM bit of incoming frames.
+ */
+- hw->flags |= IEEE80211_HW_AP_LINK_PS;
++ ieee80211_hw_set(hw, AP_LINK_PS);
+
+ hw->vif_data_size = sizeof(struct mwl_vif);
+ hw->sta_data_size = sizeof(struct mwl_sta);