lantiq: Tune the XWAY subtarget cflags

[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 19b157e..a052a1c 100644 (file)
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -14,7 +14,6 @@ mac80211_hostapd_setup_base() {
        config_get beacon_int "$device" beacon_int
        config_get basic_rate_list "$device" basic_rate
        config_get_bool noscan "$device" noscan
-       config_get_bool short_preamble "$device" short_preamble "0"
 
        hostapd_set_log_options base_cfg "$device"
 
@@ -58,8 +57,6 @@ mac80211_hostapd_setup_base() {
                done
        }
 
-       append base_cfg "preamble=$short_preamble" "$N"
-       
        cat >> "$cfgfile" <<EOF
 ctrl_interface=/var/run/hostapd-$phy
 driver=nl80211
@@ -273,17 +270,35 @@ get_freq() {
 }
 
 mac80211_generate_mac() {
-       local off="$1"
-       local mac="$2"
-       local oIFS="$IFS"; IFS=":"; set -- $mac; IFS="$oIFS"
+       local id="$1"
+       local ref="$2"
+       local mask="$3"
+
+       [ "$mask" = "00:00:00:00:00:00" ] && mask="ff:ff:ff:ff:ff:ff";
+       local oIFS="$IFS"; IFS=":"; set -- $mask; IFS="$oIFS"
+
+       local mask1=$1
+       local mask6=$6
+
+       local oIFS="$IFS"; IFS=":"; set -- $ref; IFS="$oIFS"
+       [ "$((0x$mask1))" -gt 0 ] && {
+               b1="0x$1"
+               [ "$id" -gt 0 ] && \
+                       b1=$((($b1 | 0x2) ^ (($id - 1) << 2)))
+               printf "%02x:%s:%s:%s:%s:%s" $b1 $2 $3 $4 $5 $6
+               return
+       }
 
-       local b2mask=0x00
-       [ $off -gt 0 ] && b2mask=0x02
+       [ "$((0x$mask6))" -lt 255 ] && {
+               printf "%s:%s:%s:%s:%s:%02x" $1 $2 $3 $4 $5 $(( 0x$6 ^ $id ))
+               return
+       }
 
-       printf "%02x:%s:%s:%s:%02x:%02x" \
-               $(( 0x$1 | $b2mask )) $2 $3 $4 \
-               $(( (0x$5 + ($off / 0x100)) % 0x100 )) \
-               $(( (0x$6 + $off) % 0x100 ))
+       off2=$(( (0x$6 + $id) / 0x100 ))
+       printf "%s:%s:%s:%s:%02x:%02x" \
+               $1 $2 $3 $4 \
+               $(( (0x$5 + $off2) % 0x100 )) \
+               $(( (0x$6 + $id) % 0x100 ))
 }
 
 enable_mac80211() {
@@ -378,7 +393,7 @@ enable_mac80211() {
                config_get macaddr "$device" macaddr
                config_get vif_mac "$vif" macaddr
                [ -n "$vif_mac" ] || {
-                       vif_mac="$(mac80211_generate_mac $macidx $macaddr)"
+                       vif_mac="$(mac80211_generate_mac $macidx $macaddr $(cat /sys/class/ieee80211/${phy}/address_mask))"
                        macidx="$(($macidx + 1))"
                }
                [ "$mode" = "ap" ] || ifconfig "$ifname" hw ether "$vif_mac"
@@ -396,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))
@@ -462,7 +482,7 @@ enable_mac80211() {
                                                        # make sure this wifi interface won't accidentally stay open without encryption
                                                        ifconfig "$ifname" down
                                                }
-                                               # wpa_supplicant will bring the iface up
+                                               mac80211_start_vif "$vif" "$ifname"
                                                continue
                                        fi
                                }
@@ -511,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}" || {