mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
backport mac80211, hostapd, iw, crda from trunk as of r26369
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@26370 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -6,10 +6,15 @@ 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
|
||||
config_get channel "$device" channel
|
||||
config_get beacon_int "$device" beacon_int
|
||||
config_get basic_rate_list "$device" basic_rate
|
||||
config_get_bool noscan "$device" noscan
|
||||
[ -n "$channel" -a -z "$hwmode" ] && wifi_fixup_hwmode "$device"
|
||||
[ "$channel" = auto ] && channel=
|
||||
@@ -30,7 +35,35 @@ 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
|
||||
}
|
||||
|
||||
local br brval brstr
|
||||
[ -n "$basic_rate_list" ] && {
|
||||
for br in $basic_rate_list; do
|
||||
brval="$(($br / 100))"
|
||||
[ -n "$brstr" ] && brstr="$brstr "
|
||||
brstr="$brstr$brval"
|
||||
done
|
||||
}
|
||||
|
||||
cat >> "$cfgfile" <<EOF
|
||||
ctrl_interface=/var/run/hostapd-$phy
|
||||
driver=nl80211
|
||||
wmm_ac_bk_cwmin=4
|
||||
@@ -71,8 +104,10 @@ tx_queue_data0_cwmax=7
|
||||
tx_queue_data0_burst=1.5
|
||||
${hwmode:+hw_mode=$hwmode}
|
||||
${channel:+channel=$channel}
|
||||
${beacon_int:+beacon_int=$beacon_int}
|
||||
${country:+country_code=$country}
|
||||
${noscan:+noscan=$noscan}
|
||||
${brstr:+basic_rates=$brstr}
|
||||
$base_cfg
|
||||
|
||||
EOF
|
||||
@@ -103,14 +138,20 @@ 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_bool hidden "$vif" hidden 0
|
||||
config_get maxassoc "$vif" maxassoc
|
||||
config_get dtim_period "$vif" dtim_period
|
||||
config_get max_listen_int "$vif" max_listen_int
|
||||
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
|
||||
${dtim_period:+dtim_period=$dtim_period}
|
||||
${max_listen_int:+max_listen_interval=$max_listen_int}
|
||||
${maxassoc:+max_num_sta=$maxassoc}
|
||||
EOF
|
||||
}
|
||||
@@ -216,6 +257,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
|
||||
@@ -231,6 +274,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%%.*}"
|
||||
@@ -363,14 +408,56 @@ enable_mac80211() {
|
||||
adhoc)
|
||||
config_get bssid "$vif" bssid
|
||||
config_get ssid "$vif" ssid
|
||||
config_get beacon_int "$device" beacon_int
|
||||
config_get basic_rate_list "$device" basic_rate
|
||||
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 br brval brsub brstr
|
||||
[ -n "$basic_rate_list" ] && {
|
||||
for br in $basic_rate_list; do
|
||||
brval="$(($br / 1000))"
|
||||
brsub="$((($br / 100) % 10))"
|
||||
[ "$brsub" -gt 0 ] && brval="$brval.$brsub"
|
||||
[ -n "$brstr" ] && brstr="$brstr,"
|
||||
brstr="$brstr$brval"
|
||||
done
|
||||
}
|
||||
|
||||
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 \
|
||||
${beacon_int:+beacon-interval $beacon_int} \
|
||||
${brstr:+basic-rates $brstr} \
|
||||
${mcval:+mcast-rate $mcval} \
|
||||
${keyspec:+keys $keyspec}
|
||||
;;
|
||||
sta)
|
||||
if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then
|
||||
@@ -390,7 +477,7 @@ enable_mac80211() {
|
||||
}
|
||||
|
||||
|
||||
check_device() {
|
||||
check_mac80211_device() {
|
||||
config_get phy "$1" phy
|
||||
[ -z "$phy" ] && {
|
||||
find_mac80211_phy "$1" >/dev/null || return 0
|
||||
@@ -409,7 +496,7 @@ detect_mac80211() {
|
||||
done
|
||||
for dev in $(ls /sys/class/ieee80211); do
|
||||
found=0
|
||||
config_foreach check_device wifi-device
|
||||
config_foreach check_mac80211_device wifi-device
|
||||
[ "$found" -gt 0 ] && continue
|
||||
|
||||
mode_11n=""
|
||||
|
||||
Reference in New Issue
Block a user