[tools] add m4 (required for recent auto tools)

[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 39a7034..77c7976 100644 (file)
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -4,23 +4,23 @@ append DRIVERS "mac80211"
 scan_mac80211() {
        local device="$1"
        local adhoc sta ap
 scan_mac80211() {
        local device="$1"
        local adhoc sta ap

-       
+

        config_get vifs "$device" vifs
        for vif in $vifs; do
        config_get vifs "$device" vifs
        for vif in $vifs; do

-       
+

                config_get ifname "$vif" ifname
                config_set "$vif" ifname "${ifname:-$device}"
                config_get ifname "$vif" ifname
                config_set "$vif" ifname "${ifname:-$device}"

-               
+

                config_get mode "$vif" mode
                case "$mode" in
                config_get mode "$vif" mode
                case "$mode" in

-                       adhoc|sta|ap)
+                       adhoc|sta|ap|monitor|mesh)

                                append $mode "$vif"
                        ;;
                        *) echo "$device($vif): Invalid mode, ignored."; continue;;
                esac
        done
 
                                append $mode "$vif"
                        ;;
                        *) echo "$device($vif): Invalid mode, ignored."; continue;;
                esac
        done
 

-       config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${ahdemo:+$ahdemo }${sta:+$sta }${wds:+$wds }"
+       config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${ahdemo:+$ahdemo }${sta:+$sta }${wds:+$wds }${monitor:+$monitor }${mesh:+$mesh}"

 }
 
 
 }
 
 


@@ -29,17 +29,17 @@ disable_mac80211() (
 
        set_wifi_down "$device"
        # kill all running hostapd and wpa_supplicant processes that
 
        set_wifi_down "$device"
        # kill all running hostapd and wpa_supplicant processes that

-       # are running on atheros vifs 
+       # are running on atheros/mac80211 vifs

        for pid in `pidof hostapd wpa_supplicant`; do
                grep wlan /proc/$pid/cmdline >/dev/null && \
                        kill $pid
        done
        for pid in `pidof hostapd wpa_supplicant`; do
                grep wlan /proc/$pid/cmdline >/dev/null && \
                        kill $pid
        done

-       
+

        include /lib/network
        cd /proc/sys/net
        for dev in *; do
                grep "$device" "$dev/%parent" >/dev/null 2>/dev/null && {
        include /lib/network
        cd /proc/sys/net
        for dev in *; do
                grep "$device" "$dev/%parent" >/dev/null 2>/dev/null && {

-                       ifconfig "$dev" down 
+                       ifconfig "$dev" down

                        unbridge "$dev"
                }
        done
                        unbridge "$dev"
                }
        done


@@ -50,13 +50,17 @@ enable_mac80211() {
        local device="$1"
        config_get channel "$device" channel
        config_get vifs "$device" vifs
        local device="$1"
        config_get channel "$device" channel
        config_get vifs "$device" vifs

-       
+       config_get txpower "$device" txpower
+

        local first=1
        local first=1

+       local mesh_idx=0

        for vif in $vifs; do
        for vif in $vifs; do

+               ifconfig "$ifname" down 2>/dev/null

                config_get ifname "$vif" ifname
                config_get enc "$vif" encryption
                config_get ifname "$vif" ifname
                config_get enc "$vif" encryption

+               config_get eap_type "$vif" eap_type

                config_get mode "$vif" mode
                config_get mode "$vif" mode

-               
+

                config_get ifname "$vif" ifname
                [ $? -ne 0 ] && {
                        echo "enable_mac80211($device): Failed to set up $mode vif $ifname" >&2
                config_get ifname "$vif" ifname
                [ $? -ne 0 ] && {
                        echo "enable_mac80211($device): Failed to set up $mode vif $ifname" >&2


@@ -66,12 +70,28 @@ enable_mac80211() {
 
                [ "$first" = 1 ] && {
                        # only need to change freq band and channel on the first vif
 
                [ "$first" = 1 ] && {
                        # only need to change freq band and channel on the first vif

-                       iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null 
-                       ifconfig "$ifname" up
+                       iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null
+                       if [ "$mode" = adhoc ]; then
+                               iwlist "$ifname" scan >/dev/null 2>/dev/null
+                               sleep 1
+                               iwconfig "$ifname" mode ad-hoc >/dev/null 2>/dev/null
+                       fi
+                       # mesh interface should be created only for the first interface
+                       if [ "$mode" = mesh ]; then
+                               config_get mesh_id "$vif" mesh_id
+                               if [ -n "$mesh_id" ]; then
+                                       iw dev "$ifname" interface add msh$mesh_idx type mp mesh_id $mesh_id
+                               fi
+                       fi

                        sleep 1
                        sleep 1

-                       iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null 
+                       iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null

                }
                }

-       
+               if [ "$mode" = sta ]; then
+                       iwconfig "$ifname" mode managed >/dev/null 2>/dev/null
+               else
+                       iwconfig "$ifname" mode $mode >/dev/null 2>/dev/null
+               fi
+

                wpa=
                case "$enc" in
                        WEP|wep)
                wpa=
                case "$enc" in
                        WEP|wep)


@@ -94,17 +114,18 @@ enable_mac80211() {
                case "$mode" in
                        adhoc)
                                config_get addr "$vif" bssid
                case "$mode" in
                        adhoc)
                                config_get addr "$vif" bssid

-                               [ -z "$addr" ] || { 
+                               [ -z "$addr" ] || {

                                        iwconfig "$ifname" ap "$addr"
                                }
                        ;;
                esac
                config_get ssid "$vif" ssid
 
                                        iwconfig "$ifname" ap "$addr"
                                }
                        ;;
                esac
                config_get ssid "$vif" ssid
 

-               config_get txpwr "$vif" txpower
-               if [ -n "$txpwr" ]; then
-                       iwconfig "$ifname" txpower "${txpwr%%.*}"
-               fi
+               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%%.*}"

 
                config_get frag "$vif" frag
                if [ -n "$frag" ]; then
 
                config_get frag "$vif" frag
                if [ -n "$frag" ]; then


@@ -117,7 +138,7 @@ enable_mac80211() {
                fi
 
                ifconfig "$ifname" up
                fi
 
                ifconfig "$ifname" up

-               iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null 
+               iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null

 
                local net_cfg bridge
                net_cfg="$(find_net_config "$vif")"
 
                local net_cfg bridge
                net_cfg="$(find_net_config "$vif")"


@@ -131,8 +152,8 @@ enable_mac80211() {
                case "$mode" in
                        ap)
                                if eval "type hostapd_setup_vif" 2>/dev/null >/dev/null; then
                case "$mode" in
                        ap)
                                if eval "type hostapd_setup_vif" 2>/dev/null >/dev/null; then

-                                       hostapd_setup_vif "$vif" devicescape || {
-                                               echo "enable_atheros($device): Failed to set up wpa for interface $ifname" >&2
+                                       hostapd_setup_vif "$vif" nl80211 || {
+                                               echo "enable_mac80211($device): Failed to set up wpa for interface $ifname" >&2

                                                # make sure this wifi interface won't accidentally stay open without encryption
                                                ifconfig "$ifname" down
                                                continue
                                                # make sure this wifi interface won't accidentally stay open without encryption
                                                ifconfig "$ifname" down
                                                continue


@@ -140,33 +161,23 @@ enable_mac80211() {
                                fi
                        ;;
                        sta)
                                fi
                        ;;
                        sta)

-                               case "$enc" in 
-                                       PSK|psk|PSK2|psk2)
-                                               case "$enc" in
-                                                       PSK|psk)
-                                                               proto='proto=WPA';;
-                                                       PSK2|psk2)
-                                                               proto='proto=RSN';;
-                                               esac
-                                               cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
-ctrl_interface=/var/run/wpa_supplicant
-network={
-       scan_ssid=1
-       ssid="$ssid"
-       key_mgmt=WPA-PSK
-       $proto
-       psk="$key"
-}
-EOF
-                                       ;;
-                                       WPA|wpa|WPA2|wpa2)
-                                               #add wpa_supplicant calls here
-                                       ;;
-                               esac
-                               [ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -B -D wext -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf
+                               if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then
+                                       wpa_supplicant_setup_vif "$vif" wext || {
+                                               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
+                                               continue
+                                       }
+                               fi
+                       ;;
+                       mesh)
+                               # special case where physical interface should be down for mesh to work
+                               ifconfig "$ifname" down
+                               ifconfig "msh$mesh_idx" up

                        ;;
                esac
                first=0
                        ;;
                esac
                first=0

+               mesh_idx=$(expr $mesh_idx + 1)

        done
 }
 
        done
 }