mac80211/hostapd: short_preamble is a per-vif option and should be enabled by default
[openwrt.git] / package / mac80211 / files / lib / wifi / mac80211.sh
index 13390b8..1ad3eb5 100644 (file)
@@ -6,8 +6,6 @@ mac80211_hostapd_setup_base() {
        local ifname="$2"
 
        cfgfile="/var/run/hostapd-$phy.conf"
-       macfile="/var/run/hostapd-$phy.maclist"
-       [ -e "$macfile" ] && rm -f "$macfile"
 
        config_get device "$vif" device
        config_get country "$device" country
@@ -50,24 +48,6 @@ mac80211_hostapd_setup_base() {
        config_get_bool country_ie "$device" country_ie "$country_ie"
        [ "$country_ie" -gt 0 ] && append base_cfg "ieee80211d=1" "$N"
 
-       config_get macfilter "$vif" macfilter
-       case "$macfilter" in
-               allow)
-                       append base_cfg "macaddr_acl=1" "$N"
-                       append base_cfg "accept_mac_file=$macfile" "$N"
-                       ;;
-               deny)
-                       append base_cfg "macaddr_acl=0" "$N"
-                       append base_cfg "deny_mac_file=$macfile" "$N"
-                       ;;
-       esac
-       config_get maclist "$vif" maclist
-       [ -n "$maclist" ] && {
-               for mac in $maclist; do
-                       echo "$mac" >> $macfile
-               done
-       }
-
        local br brval brstr
        [ -n "$basic_rate_list" ] && {
                for br in $basic_rate_list; do
@@ -76,7 +56,7 @@ mac80211_hostapd_setup_base() {
                        brstr="$brstr$brval"
                done
        }
-       
+
        cat >> "$cfgfile" <<EOF
 ctrl_interface=/var/run/hostapd-$phy
 driver=nl80211
@@ -181,26 +161,46 @@ mac80211_start_vif() {
        set_wifi_up "$vif" "$ifname"
 }
 
-find_mac80211_phy() {
-       local device="$1"
+lookup_phy() {
+       [ -n "$phy" ] && {
+               [ -d /sys/class/ieee80211/$phy ] && return
+       }
+
+       local devpath
+       config_get devpath "$device" path
+       [ -n "$devpath" -a -d "/sys/devices/$devpath/ieee80211" ] && {
+               phy="$(ls /sys/devices/$devpath/ieee80211 | grep -m 1 phy)"
+               [ -n "$phy" ] && return
+       }
 
        local macaddr="$(config_get "$device" macaddr | tr 'A-Z' 'a-z')"
-       config_get phy "$device" phy
-       [ -z "$phy" -a -n "$macaddr" ] && {
-               for phy in $(ls /sys/class/ieee80211 2>/dev/null); do
-                       [ "$macaddr" = "$(cat /sys/class/ieee80211/${phy}/macaddress)" ] || continue
-                       config_set "$device" phy "$phy"
-                       break
+       [ -n "$macaddr" ] && {
+               for _phy in $(ls /sys/class/ieee80211 2>/dev/null); do
+                       [ "$macaddr" = "$(cat /sys/class/ieee80211/${_phy}/macaddress)" ] || continue
+                       phy="$_phy"
+                       return
                done
-               config_get phy "$device" phy
        }
+       phy=
+       return
+}
+
+find_mac80211_phy() {
+       local device="$1"
+
+       config_get phy "$device" phy
+       lookup_phy
        [ -n "$phy" -a -d "/sys/class/ieee80211/$phy" ] || {
                echo "PHY for wifi device $1 not found"
                return 1
        }
+       config_set "$device" phy "$phy"
+
+       config_get macaddr "$device" macaddr
        [ -z "$macaddr" ] && {
                config_set "$device" macaddr "$(cat /sys/class/ieee80211/${phy}/macaddress)"
        }
+
        return 0
 }
 
@@ -292,6 +292,7 @@ enable_mac80211() {
        config_get distance "$device" distance
        config_get txantenna "$device" txantenna all
        config_get rxantenna "$device" rxantenna all
+       config_get antenna_gain "$device" antenna_gain 0
        config_get frag "$device" frag
        config_get rts "$device" rts
        find_mac80211_phy "$device" || return 0
@@ -309,15 +310,16 @@ enable_mac80211() {
                }
        }
 
-       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
+       config_get chanbw "$device" chanbw
+       [ -n "$chanbw" -a -d /sys/kernel/debug/ieee80211/$phy/ath9k ] && echo "$chanbw" > /sys/kernel/debug/ieee80211/$phy/ath9k/chanbw
+       [ -n "$chanbw" -a -d /sys/kernel/debug/ieee80211/$phy/ath5k ] && echo "$chanbw" > /sys/kernel/debug/ieee80211/$phy/ath5k/bwmode
 
-       [ -n "$country" ] && iw reg set "$country"
        [ "$channel" = "auto" -o "$channel" = "0" ] || {
                fixed=1
        }
 
        iw phy "$phy" set antenna $txantenna $rxantenna >/dev/null 2>&1
+       iw phy "$phy" set antenna_gain $antenna_gain
 
        [ -n "$distance" ] && iw phy "$phy" set distance "$distance"
        [ -n "$frag" ] && iw phy "$phy" set frag "${frag%%.*}"
@@ -442,8 +444,26 @@ enable_mac80211() {
                                config_get encryption "$vif" encryption
                                config_get key "$vif" key 1
                                config_get mcast_rate "$vif" mcast_rate
+                               config_get htmode "$device" htmode
+                               case "$htmode" in
+                                       HT20|HT40+|HT40-) ;;
+                                       *) htmode= ;;
+                               esac
+
 
                                local keyspec=""
+                               [ "$encryption" == "psk" -o "$encryption" == "psk2" ] && {
+                                       if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then
+                                               wpa_supplicant_setup_vif "$vif" nl80211 "${hostapd_ctrl:+-H $hostapd_ctrl}" $freq $htmode || {
+                                                       echo "enable_mac80211($device): Failed to set up wpa_supplicant for interface $ifname" >&2
+                                                       # make sure this wifi interface won't accidentally stay open without encryption
+                                                       ifconfig "$ifname" down
+                                               }
+                                               mac80211_start_vif "$vif" "$ifname"
+                                               continue
+                                       fi
+                               }
+
                                [ "$encryption" == "wep" ] && {
                                        case "$key" in
                                                [1234])
@@ -481,12 +501,6 @@ enable_mac80211() {
                                        [ "$mcsub" -gt 0 ] && mcval="$mcval.$mcsub"
                                }
 
-                               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} \
@@ -558,12 +572,20 @@ detect_mac80211() {
                }
                iw phy "$dev" info | grep -q '2412 MHz' || { mode_band="a"; channel="36"; }
 
+               if [ -x /usr/bin/readlink ]; then
+                       path="$(readlink -f /sys/class/ieee80211/${dev}/device)"
+                       path="${path##/sys/devices/}"
+                       dev_id="        option path     '$path'"
+               else
+                       dev_id="        option macaddr  $(cat /sys/class/ieee80211/${dev}/macaddress)"
+               fi
+
                cat <<EOF
 config wifi-device  radio$devidx
        option type     mac80211
        option channel  ${channel}
-       option macaddr  $(cat /sys/class/ieee80211/${dev}/macaddress)
        option hwmode   11${mode_11n}${mode_band}
+$dev_id
 $ht_capab
        # REMOVE THIS LINE TO ENABLE WIFI:
        option disabled 1