From a18afedff77ee5626910b8310cbb08b840977868 Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 7 Apr 2013 22:05:36 +0000 Subject: mac80211: merge an idle handling fix (fixes ath9k_htc client mode), refresh patches Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36265 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches/701-mwl8k-don-t-overwrite-regulatory-settings.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/mac80211/patches/701-mwl8k-don-t-overwrite-regulatory-settings.patch') diff --git a/package/mac80211/patches/701-mwl8k-don-t-overwrite-regulatory-settings.patch b/package/mac80211/patches/701-mwl8k-don-t-overwrite-regulatory-settings.patch index dd6348f70..890debc47 100644 --- a/package/mac80211/patches/701-mwl8k-don-t-overwrite-regulatory-settings.patch +++ b/package/mac80211/patches/701-mwl8k-don-t-overwrite-regulatory-settings.patch @@ -49,7 +49,7 @@ Signed-off-by: Jonas Gorski /* * Running count of TX packets in flight, to avoid -@@ -2401,6 +2402,9 @@ mwl8k_set_caps(struct ieee80211_hw *hw, +@@ -2401,6 +2402,9 @@ mwl8k_set_caps(struct ieee80211_hw *hw, { struct mwl8k_priv *priv = hw->priv; @@ -59,7 +59,7 @@ Signed-off-by: Jonas Gorski if ((caps & MWL8K_CAP_2GHZ4) || !(caps & MWL8K_CAP_BAND_MASK)) { mwl8k_setup_2ghz_band(hw); if (caps & MWL8K_CAP_MIMO) -@@ -2412,6 +2416,8 @@ mwl8k_set_caps(struct ieee80211_hw *hw, +@@ -2412,6 +2416,8 @@ mwl8k_set_caps(struct ieee80211_hw *hw, if (caps & MWL8K_CAP_MIMO) mwl8k_set_ht_caps(hw, &priv->band_50, caps); } -- cgit v1.2.3