mac80211: ignore errors in the command to set the rx/tx antenna - many drivers do...

[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 46c8c2a..ac1562f 100644 (file)
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -6,6 +6,9 @@ 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
        config_get hwmode "$device" hwmode
@@ -30,7 +33,25 @@ mac80211_hostapd_setup_base() {
                        [ -n "$ht_capab" ] && append base_cfg "ht_capab=$ht_capab" "$N"
                }
        }
-       cat > "$cfgfile" <<EOF
+
+       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
+       }
+       cat >> "$cfgfile" <<EOF
 ctrl_interface=/var/run/hostapd-$phy
 driver=nl80211
 wmm_ac_bk_cwmin=4
@@ -103,13 +124,17 @@ mac80211_hostapd_setup_bss() {
        config_get_bool wds "$vif" wds 0
        [ "$wds" -gt 0 ] && append hostapd_cfg "wds_sta=1" "$N"
 
+       local macaddr hidden maxassoc wmm
        config_get macaddr "$vif" macaddr
+       config_get maxassoc "$vif" maxassoc
        config_get_bool hidden "$vif" hidden 0
+       config_get_bool wmm "$vif" wmm 1
        cat >> /var/run/hostapd-$phy.conf <<EOF
 $hostapd_cfg
-wmm_enabled=1
+wmm_enabled=$wmm
 bssid=$macaddr
 ignore_broadcast_ssid=$hidden
+${maxassoc:+max_num_sta=$maxassoc}
 EOF
 }
 
@@ -214,6 +239,8 @@ enable_mac80211() {
        config_get txpower "$device" txpower
        config_get country "$device" country
        config_get distance "$device" distance
+       config_get txantenna "$device" txantenna all
+       config_get rxantenna "$device" rxantenna all
        config_get frag "$device" frag
        config_get rts "$device" rts
        find_mac80211_phy "$device" || return 0
@@ -229,6 +256,8 @@ enable_mac80211() {
                fixed=1
        }
 
+       iw phy "$phy" set antenna $txantenna $rxantenna >/dev/null 2>&1
+
        [ -n "$distance" ] && iw phy "$phy" set distance "$distance"
        [ -n "$frag" ] && iw phy "$phy" set frag "${frag%%.*}"
        [ -n "$rts" ] && iw phy "$phy" set rts "${rts%%.*}"
@@ -317,12 +346,11 @@ enable_mac80211() {
                        [ -n "$fixed" -a -n "$channel" ] && iw dev "$ifname" set channel "$channel"
                fi
 
-               # txpower is not yet implemented in iw
                config_get vif_txpower "$vif" txpower
                # use vif_txpower (from wifi-iface) to override txpower (from
                # wifi-device) if the latter doesn't exist
                txpower="${txpower:-$vif_txpower}"
-               [ -z "$txpower" ] || iwconfig "$ifname" txpower "${txpower%%.*}"
+               [ -z "$txpower" ] || iw dev "$ifname" set txpower fixed "${txpower%%.*}00"
        done
 
        local start_hostapd=
@@ -362,14 +390,45 @@ enable_mac80211() {
                                adhoc)
                                        config_get bssid "$vif" bssid
                                        config_get ssid "$vif" ssid
+                                       config_get bintval "$vif" bintval
+                                       config_get basicrates "$vif" basicrates
+                                       config_get encryption "$vif" encryption
+                                       config_get key "$vif" key 1
                                        config_get mcast_rate "$vif" mcast_rate
+
+                                       local keyspec=""
+                                       [ "$encryption" == "wep" ] && {
+                                               case "$key" in
+                                                       [1234])
+                                                               local idx
+                                                               for idx in 1 2 3 4; do
+                                                                       local ikey
+                                                                       config_get ikey "$vif" "key$idx"
+
+                                                                       [ -n "$ikey" ] && {
+                                                                               ikey="$(($idx - 1)):$(prepare_key_wep "$ikey")"
+                                                                               [ $idx -eq $key ] && ikey="d:$ikey"
+                                                                               append keyspec "$ikey"
+                                                                       }
+                                                               done
+                                                       ;;
+                                                       *) append keyspec "d:0:$(prepare_key_wep "$key")" ;;
+                                               esac
+                                       }
+
                                        local mcval=""
                                        [ -n "$mcast_rate" ] && {
                                                mcval="$(($mcast_rate / 1000))"
                                                mcsub="$(( ($mcast_rate / 100) % 10 ))"
                                                [ "$mcsub" -gt 0 ] && mcval="$mcval.$mcsub"
                                        }
-                                       iw dev "$ifname" ibss join "$ssid" $freq ${fixed:+fixed-freq} $bssid ${mcval:+mcast-rate $mcval}
+
+                                       iw dev "$ifname" ibss join "$ssid" $freq \
+                                               ${fixed:+fixed-freq} $bssid \
+                                               ${bintval:+beacon-interval $bintval} \
+                                               ${basicrates:+basic-rates $basicrates} \
+                                               ${mcval:+mcast-rate $mcval} \
+                                               ${keyspec:+keys $keyspec}
                                ;;
                                sta)
                                        if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then