diff options
| author | James Rayner <james@archlinux.org> | 2009-09-22 14:15:02 +0200 |
|---|---|---|
| committer | James Rayner <james@archlinux.org> | 2009-09-22 14:15:02 +0200 |
| commit | 1c6760ebd6b7d6630fbab75885fac5dbea90c78b (patch) | |
| tree | 05e67c2ab4fab972984fae3671b2b5cae116d2e7 /src/connections/wireless | |
| parent | 57bed3df9310db328d80b32b31fdefa8418bbd1e (diff) | |
| download | netctl-1c6760ebd6b7d6630fbab75885fac5dbea90c78b.tar.gz netctl-1c6760ebd6b7d6630fbab75885fac5dbea90c78b.tar.xz | |
Merge connections ethernet/ethernet-iproute
Diffstat (limited to 'src/connections/wireless')
| -rw-r--r-- | src/connections/wireless | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/connections/wireless b/src/connections/wireless index e1d4a44..6e9ecd2 100644 --- a/src/connections/wireless +++ b/src/connections/wireless @@ -42,7 +42,7 @@ wireless_up() { fi report_debug wireless_up ifup - bring_interface up-old "$INTERFACE" || return 1 + bring_interface up "$INTERFACE" || return 1 quirk prescan && iwlist "$INTERFACE" scan &> /dev/null # bcm43xx if quirk preessid; then # ipw3945 @@ -102,7 +102,7 @@ wireless_up() { if quirk "predown"; then # madwifi FS#10585 # ignore quirk nodown---is that appropriate? # this adds a flush call as well---is that appropriate? - bring_interface forcedown-old "$INTERFACE" + bring_interface forcedown "$INTERFACE" fi report_debug wireless_up iwconfig "$INTERFACE" $WEP_OPTS @@ -114,7 +114,7 @@ wireless_up() { fi if quirk "predown"; then # madwifi FS#10585 - bring_interface up-old "$INTERFACE" + bring_interface up "$INTERFACE" fi report_debug ethernet_up wep_check @@ -186,9 +186,7 @@ wireless_up() { ;; esac - conn=ethernet - checkyesno "${IPROUTE:-no}" && conn=ethernet-iproute - if ! "$CONN_DIR/$conn" up "$1"; then + if ! $CONN_DIR/ethernet up "$1"; then wireless_down "$1" YES return 1 fi @@ -200,9 +198,7 @@ wireless_down() { load_profile "$PROFILE" . "$SUBR_DIR/8021x" if ! checkyesno "$NOETHERNETDOWN"; then - conn=ethernet - checkyesno "${IPROUTE:-no}" && conn=ethernet-iproute - "$CONN_DIR/$conn" down "$PROFILE" + "$CONN_DIR/ethernet" down "$PROFILE" fi report_debug wireless_down stop_wpa "$INTERFACE" stop_wpa "$INTERFACE" @@ -212,7 +208,7 @@ wireless_down() { # respects quirk nodown---is that appropriate? # wasn't this already called in ethernet_down? but does the call there respect quirk nodown? # this adds a flush call as well---is that appropriate? - bring_interface down-old "$INTERFACE" + bring_interface down "$INTERFACE" # Handle wireless kill switches # Any reason why a hardware switch should be considered on interface down? |