EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

authsae: Use kbit/s as mcast_rate unit like wpad

Browse Source 
The OpenWrt wireless configuration for mcast_rate is defined as Kbit/s when
using wpa_supplicant for IBSS/802.11s and iw for unencrypted IBSS/802.11s.
But when using authsae, the unit for the same option is redefined as
Mbit/s. Better use the same unit for this option independent of the backend
which is used.

Old values for mcast_rate (< 1000) are still interpreted Mbit/s to avoid
problems during upgrades from older versions.

Signed-off-by: Sven Eckelmann <sven@open-mesh.com>

SVN-Revision: 47614
This commit is contained in:
John Crispin 2015-11-24 18:28:35 +00:00
parent b816d6276d
commit 939175e9f2
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package/network/services/authsae/files/lib/wifi/authsae.sh
View File

@ -6,7 +6,7 @@ authsae_start_interface() {
local ret=1 local ret=1
json_get_vars mcast_rate mesh_id json_get_vars mcast_rate mesh_id
set_default mcast_rate "12" set_default mcast_rate "12000"
case "$htmode" in case "$htmode" in
HT20|HT40+|HT40-) mesh_htmode="$htmode";; HT20|HT40+|HT40-) mesh_htmode="$htmode";;
@ -18,6 +18,14 @@ authsae_start_interface() {
*a*) mesh_band=11a;; *a*) mesh_band=11a;;
esac esac
if [ "$mcast_rate" -gt 1000 ]; then
# authsae only allows integers as rates and not things like 5.5
mcval=$(($mcast_rate / 1000))
else
# compat: to still support mbit/s rates
mcval="$mcast_rate"
fi
cat > "$authsae_conf_file" <<EOF cat > "$authsae_conf_file" <<EOF
authsae: authsae:
{ {
@ -40,7 +48,7 @@ authsae:
band = "$mesh_band"; band = "$mesh_band";
channel = $channel; channel = $channel;
htmode = "$mesh_htmode"; htmode = "$mesh_htmode";
mcast-rate = $mcast_rate; mcast-rate = $mcval;
}; };
}; };
EOF EOF