diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-07-22 16:01:17 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-07-22 16:01:17 +0000 |
| commit | 8344c770fca75cc74ec6bd9a6eacfb9d9f0b8aa1 (patch) | |
| tree | d95e3df9783a28647dd3965bd54181c7ee94776e | |
| parent | 900aaa919b5685c06ae0087aaad5bdd6d6a4882a (diff) | |
| download | upstream-8344c770fca75cc74ec6bd9a6eacfb9d9f0b8aa1.tar.gz upstream-8344c770fca75cc74ec6bd9a6eacfb9d9f0b8aa1.tar.bz2 upstream-8344c770fca75cc74ec6bd9a6eacfb9d9f0b8aa1.zip | |
mac80211: fix handling of frag and rts options, thanks stintel!
SVN-Revision: 22355
| -rw-r--r-- | package/mac80211/files/lib/wifi/mac80211.sh | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh index a963db81ba..f022e262d9 100644 --- a/package/mac80211/files/lib/wifi/mac80211.sh +++ b/package/mac80211/files/lib/wifi/mac80211.sh @@ -214,6 +214,8 @@ enable_mac80211() { config_get txpower "$device" txpower config_get country "$device" country config_get distance "$device" distance + config_get frag "$device" frag + config_get rts "$device" rts find_mac80211_phy "$device" || return 0 config_get phy "$device" phy local i=0 @@ -227,6 +229,8 @@ enable_mac80211() { } [ -n "$distance" ] && iw phy "$phy" set distance "$distance" + [ -n "$frag" ] && iw phy "$phy" set frag "${frag%%.*}" + [ -n "$rts" ] && iw phy "$phy" set rts "${rts%%.*}" export channel fixed # convert channel to frequency @@ -318,16 +322,6 @@ enable_mac80211() { # wifi-device) if the latter doesn't exist txpower="${txpower:-$vif_txpower}" [ -z "$txpower" ] || iwconfig "$ifname" txpower "${txpower%%.*}" - - config_get frag "$vif" frag - if [ -n "$frag" ]; then - iw phy "$phy" set frag "${frag%%.*}" - fi - - config_get rts "$vif" rts - if [ -n "$rts" ]; then - iw phy "$phy" set rts "${rts%%.*}" - fi done local start_hostapd= |