diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-07-12 08:19:04 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-07-12 08:19:04 +0000 |
| commit | d1af787dc992741bffa1a1ce0b4ca7eacb1f7227 (patch) | |
| tree | b4d150683b180b04da569f049a53d592956d705b /package/mac80211/files/lib | |
| parent | 700de21fec69cc8b11374be00d04660ffbd48943 (diff) | |
| download | upstream-d1af787dc992741bffa1a1ce0b4ca7eacb1f7227.tar.gz upstream-d1af787dc992741bffa1a1ce0b4ca7eacb1f7227.tar.bz2 upstream-d1af787dc992741bffa1a1ce0b4ca7eacb1f7227.zip | |
mac80211: backport latest version from trunk (as of r37265)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@37266 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/files/lib')
| -rw-r--r-- | package/mac80211/files/lib/wifi/mac80211.sh | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh index 081dc4d886..a052a1cbfb 100644 --- a/package/mac80211/files/lib/wifi/mac80211.sh +++ b/package/mac80211/files/lib/wifi/mac80211.sh @@ -411,7 +411,12 @@ enable_mac80211() { # We attempt to set the channel for all interfaces, although # mac80211 may not support it or the driver might not yet # for ap mode this is handled by hostapd - [ -n "$fixed" -a -n "$channel" ] && iw dev "$ifname" set channel "$channel" + config_get htmode "$device" htmode + case "$htmode" in + HT20|HT40+|HT40-) ;; + *) htmode= ;; + esac + [ -n "$fixed" -a -n "$channel" ] && iw dev "$ifname" set channel "$channel" $htmode fi i=$(($i + 1)) @@ -526,6 +531,20 @@ enable_mac80211() { ${mcval:+mcast-rate $mcval} \ ${keyspec:+keys $keyspec} ;; + mesh) + mp_list="mesh_retry_timeout mesh_confirm_timeout mesh_holding_timeout mesh_max_peer_links + mesh_max_retries mesh_ttl mesh_element_ttl mesh_auto_open_plinks mesh_hwmp_max_preq_retries + mesh_path_refresh_time mesh_min_discovery_timeout mesh_hwmp_active_path_timeout + mesh_hwmp_preq_min_interval mesh_hwmp_net_diameter_traversal_time mesh_hwmp_rootmode + mesh_hwmp_rann_interval mesh_gate_announcements mesh_fwding mesh_sync_offset_max_neighor + mesh_rssi_threshold mesh_hwmp_active_path_to_root_timeout mesh_hwmp_root_interval + mesh_hwmp_confirmation_interval mesh_power_mode mesh_awake_window" + for mp in $mp_list + do + config_get mp_val "$vif" "$mp" "" + [ -n "$mp_val" ] && iw dev "$ifname" set mesh_param "$mp" "$mp_val" + done + ;; sta) if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then wpa_supplicant_setup_vif "$vif" nl80211 "${hostapd_ctrl:+-H $hostapd_ctrl}" || { |