mac80211: Add new parameters to mac80211.sh

Add new options 'bintval' (beacon interval), 'basicrates' (basic rates) and
'antenna' (antenna selection) for /etc/config/wireless to be used with
mac80211 drivers.

Enable WEP encryption for IBSS mode.

Patch from: kentarou matsuyama <matsuyama@thinktube.com>

SVN-Revision: 25111
This commit is contained in:
Felix Fietkau 2011-01-26 11:34:15 +00:00
parent 2b01200057
commit 0cd2b87f95

View file

@ -239,6 +239,7 @@ enable_mac80211() {
config_get txpower "$device" txpower config_get txpower "$device" txpower
config_get country "$device" country config_get country "$device" country
config_get distance "$device" distance config_get distance "$device" distance
config_get antenna "$device" antenna
config_get frag "$device" frag config_get frag "$device" frag
config_get rts "$device" rts config_get rts "$device" rts
find_mac80211_phy "$device" || return 0 find_mac80211_phy "$device" || return 0
@ -255,6 +256,7 @@ enable_mac80211() {
} }
[ -n "$distance" ] && iw phy "$phy" set distance "$distance" [ -n "$distance" ] && iw phy "$phy" set distance "$distance"
[ -n "$antenna" ] && iw phy "$phy" set antenna $antenna
[ -n "$frag" ] && iw phy "$phy" set frag "${frag%%.*}" [ -n "$frag" ] && iw phy "$phy" set frag "${frag%%.*}"
[ -n "$rts" ] && iw phy "$phy" set rts "${rts%%.*}" [ -n "$rts" ] && iw phy "$phy" set rts "${rts%%.*}"
@ -386,14 +388,21 @@ enable_mac80211() {
adhoc) adhoc)
config_get bssid "$vif" bssid config_get bssid "$vif" bssid
config_get ssid "$vif" ssid 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
config_get mcast_rate "$vif" mcast_rate config_get mcast_rate "$vif" mcast_rate
[ -n "$bintval" ] && BINTVAL="beacon-interval $bintval"
[ -n "$basicrates" ] && BRATES="basic-rates $basicrates"
[ "$encryption" == "wep" ] && [ -n "$key" ] && KEY="key d:0:$key"
local mcval="" local mcval=""
[ -n "$mcast_rate" ] && { [ -n "$mcast_rate" ] && {
mcval="$(($mcast_rate / 1000))" mcval="$(($mcast_rate / 1000))"
mcsub="$(( ($mcast_rate / 100) % 10 ))" mcsub="$(( ($mcast_rate / 100) % 10 ))"
[ "$mcsub" -gt 0 ] && mcval="$mcval.$mcsub" [ "$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 ${mcval:+mcast-rate $mcval} $BINTVAL $BRATES $KEY
;; ;;
sta) sta)
if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then