ath9k: fold patches that were merged upstream into 300-pending_work.patch

[openwrt.git] / package / mac80211 / files / lib / wifi / mac80211.sh

diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index 2ca63bb..dbf13b8 100644 (file)
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -274,6 +274,9 @@ enable_mac80211() {
        fixed=""
        local hostapd_ctrl=""
 
+       config_get ath9k_chanbw "$device" ath9k_chanbw
+       [ -n "$ath9k_chanbw" -a -d /sys/kernel/debug/ieee80211/$phy/ath9k ] && echo "$ath9k_chanbw" > /sys/kernel/debug/ieee80211/$phy/ath9k/chanbw
+
        [ -n "$country" ] && iw reg set "$country"
        [ "$channel" = "auto" -o "$channel" = "0" ] || {
                fixed=1
@@ -457,7 +460,13 @@ enable_mac80211() {
                                                [ "$mcsub" -gt 0 ] && mcval="$mcval.$mcsub"
                                        }
 
-                                       iw dev "$ifname" ibss join "$ssid" $freq \
+                                       config_get htmode "$device" htmode
+                                       case "$htmode" in
+                                               HT20|HT40+|HT40-) ;;
+                                               *) htmode= ;;
+                                       esac
+
+                                       iw dev "$ifname" ibss join "$ssid" $freq $htmode \
                                                ${fixed:+fixed-freq} $bssid \
                                                ${beacon_int:+beacon-interval $beacon_int} \
                                                ${brstr:+basic-rates $brstr} \