summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-01-26 11:34:15 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-01-26 11:34:15 +0000
commit593e983ee0461574c78be156056220e6b84fd28c (patch)
treeda6f63faa4eed5b3559fe6923f4afe2b9f50b3a0 /package
parente7706e4dfb21201946849ad50fe2b0e58845c50a (diff)
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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25111 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/mac80211/files/lib/wifi/mac80211.sh11
1 files changed, 10 insertions, 1 deletions
diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index 251c2f13d..fb96b9546 100644
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -239,6 +239,7 @@ enable_mac80211() {
config_get txpower "$device" txpower
config_get country "$device" country
config_get distance "$device" distance
+ config_get antenna "$device" antenna
config_get frag "$device" frag
config_get rts "$device" rts
find_mac80211_phy "$device" || return 0
@@ -255,6 +256,7 @@ enable_mac80211() {
}
[ -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 "$rts" ] && iw phy "$phy" set rts "${rts%%.*}"
@@ -386,14 +388,21 @@ 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
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=""
[ -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 ${mcval:+mcast-rate $mcval} $BINTVAL $BRATES $KEY
;;
sta)
if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then