diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-10-11 00:36:23 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-10-11 00:36:23 +0000 |
| commit | 4cb436429b8974624535733b07c33be70ff55c8d (patch) | |
| tree | fdd1177dc4718a17abb4693be40332b15973c15a /package/mac80211/files/lib/wifi | |
| parent | 0ba61fe414f89fe61e990f124afcf9e6f8fe61e8 (diff) | |
| download | upstream-4cb436429b8974624535733b07c33be70ff55c8d.tar.gz upstream-4cb436429b8974624535733b07c33be70ff55c8d.tar.bz2 upstream-4cb436429b8974624535733b07c33be70ff55c8d.zip | |
mac80211: upgrade to latest compat-wireless, fix ad-hoc interface setup
SVN-Revision: 18023
Diffstat (limited to 'package/mac80211/files/lib/wifi')
| -rw-r--r-- | package/mac80211/files/lib/wifi/mac80211.sh | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh index a7b3005dd9..1a8272aca8 100644 --- a/package/mac80211/files/lib/wifi/mac80211.sh +++ b/package/mac80211/files/lib/wifi/mac80211.sh @@ -66,7 +66,11 @@ disable_mac80211() ( return 0 ) - +get_freq() { + local phy="$1" + local channel="$2" + iw "$phy" info | grep -E -m1 "(\* ${channel:-....} MHz${channel:+|\\[$channel\\]})" | grep MHz | awk '{print $2}' +} enable_mac80211() { local device="$1" config_get channel "$device" channel @@ -76,6 +80,9 @@ enable_mac80211() { config_get phy "$device" phy local i=0 + # convert channel to frequency + local freq="$(get_freq "$phy" "$channel")" + wifi_fixup_hwmode "$device" "g" for vif in $vifs; do while [ -d "/sys/class/net/wlan$i" ]; do @@ -134,7 +141,7 @@ enable_mac80211() { # We attempt to set teh channel for all interfaces, although # mac80211 may not support it or the driver might not yet - iw dev "$ifname" set channel "$channel" + [ -z "$channel" ] || iw dev "$ifname" set channel "$channel" local key keystring @@ -213,7 +220,11 @@ enable_mac80211() { } fi ;; - sta|mesh|adhoc) + adhoc) + config_get bssid "$vif" bssid + iw dev "$ifname" ibss join "$ssid" ${freq:+$freq fixed-freq} $bssid + ;; + sta|mesh) # Fixup... sometimes you have to scan to get beaconing going iw dev "$ifname" scan &> /dev/null case "$enc" in |