diff options
| author | Jouke Witteveen <j.witteveen@gmail.com> | 2012-12-30 14:02:24 +0100 |
|---|---|---|
| committer | Jouke Witteveen <j.witteveen@gmail.com> | 2012-12-30 14:02:24 +0100 |
| commit | cb6404f27347226bc8c30ac432c808729964232d (patch) | |
| tree | 7263e6d664ecdcf9743a922ff8264d0d162cc1eb | |
| parent | 7ae917a0ea8517ff0ffe03d3884aee64cd7dcfcd (diff) | |
| download | netctl-cb6404f27347226bc8c30ac432c808729964232d.tar.gz netctl-cb6404f27347226bc8c30ac432c808729964232d.tar.xz | |
Drop the Scan parameter
It was quite useless.
| -rw-r--r-- | docs/netctl.profile.5.txt | 5 | ||||
| -rw-r--r-- | src/lib/connections/wireless | 10 |
2 files changed, 1 insertions, 14 deletions
diff --git a/docs/netctl.profile.5.txt b/docs/netctl.profile.5.txt index 21ea52c..6c3c4a7 100644 --- a/docs/netctl.profile.5.txt +++ b/docs/netctl.profile.5.txt @@ -211,11 +211,6 @@ of the `wireless' type: Whether or not the specified network is a hidden network. Defaults to ``no`'. -'Scan=':: - Whether or not to scan for the presence of a network before - attempting to connect. Hidden networks do not appear in a scan. - Defaults to ``no`'. - 'AdHoc=':: Whether or not to use ad-hoc mode. Defaults to ``no`'. diff --git a/src/lib/connections/wireless b/src/lib/connections/wireless index a3b324b..0e7cfe4 100644 --- a/src/lib/connections/wireless +++ b/src/lib/connections/wireless @@ -45,15 +45,6 @@ wireless_up() { return 1 fi - if is_yes "${Scan:-no}"; then - if ! wpa_wait_while_state "$TimeoutWPA" "$Interface" "DISCONNECTED" "SCANNING"; then - report_error "Wireless network '$ESSID' (or access point) not present" - wpa_stop "$Interface" - bring_interface_down "$interface" - return 1 - fi - fi - # Bring interface up after starting wpa_supplicant # This is important since cards such as iwl3945 do not support # mode switching when they are already up. @@ -61,6 +52,7 @@ wireless_up() { if ! wpa_wait_until_state "$TimeoutWPA" "$Interface" "COMPLETED"; then report_error "WPA association/authentication failed for interface '$Interface'" + report_debug "WPA state for interface '$Interface': $(wpa_get_state "$Interface")" wpa_stop "$Interface" bring_interface_down "$Interface" return 1 |