Rename set_interface to bring_interface

3. Change the name of "set_interface up/down..." to "bring_interface
up/down" to differentiate it from the similarly-named, merely record-keeping functions.

Signed-off-by: Jim Pryor <profjim@jimpryor.net>

4 files changed, 13 insertions, 13 deletions

diff --git a/src/connections/ethernet b/src/connections/ethernet
index 8e34327..e24cc3e 100644
--- a/src/connections/ethernet
+++ b/src/connections/ethernet
@@ -12,7 +12,7 @@ ethernet_up() {
     fi
 
     report_debug ethernet_up ifup
-    set_interface up-old "$INTERFACE"
+    bring_interface up-old "$INTERFACE"
 
     # don't think it's possible to detect carrier using ifconfig alone (at least, not without ifdown/ifupping the interface)
     if [[ $(cat "/sys/class/net/$INTERFACE/carrier" 2>/dev/null) -ne 1 ]]; then   # gives err if iface inactive (i.e. ifdown)
@@ -32,7 +32,7 @@ ethernet_up() {
         if ! wpa_check "$INTERFACE"; then
             # ignore quirk nodown---is that appropriate?
             # this adds a flush call as well---is that appropriate?
-            set_interface forcedown-old "$INTERFACE"
+            bring_interface forcedown-old "$INTERFACE"
             report_fail "WPA Authentication/Association Failed"
             return 1
         fi
@@ -79,7 +79,7 @@ ethernet_up() {
                 # JP: don't we want to add this to all the aborts?
                 # ignore quirk nodown---is that appropriate?
                 # this adds a flush call as well---is that appropriate?
-                set_interface forcedown-old "$INTERFACE"
+                bring_interface forcedown-old "$INTERFACE"
                 report_fail "Adding gateway $GATEWAY failed."
                 return 1
             fi
@@ -145,7 +145,7 @@ ethernet_down() {
     report_debug ethernet_down ifdown
     # ignore quirk nodown---is that appropriate?
     # this adds a flush call as well---is that appropriate?
-    set_interface forcedown-old "$INTERFACE"
+    bring_interface forcedown-old "$INTERFACE"
 }
 
 # Returns status of profile - is it still functional?
diff --git a/src/connections/ethernet-iproute b/src/connections/ethernet-iproute
index 9da4b37..088d25b 100644
--- a/src/connections/ethernet-iproute
+++ b/src/connections/ethernet-iproute
@@ -4,7 +4,7 @@
 report_iproute()
 {
     report_fail "$*"
-    set_interface down "$INTERFACE"
+    bring_interface down "$INTERFACE"
     exit 1
 }
 
@@ -18,7 +18,7 @@ ethernet_up() {
     fi
 
     report_debug ethernet_iproute_up ifup
-    set_interface up "$INTERFACE"
+    bring_interface up "$INTERFACE"
 
 
     if ip link show dev "$INTERFACE" | fgrep -q "NO-CARRIER"; then
@@ -39,7 +39,7 @@ ethernet_up() {
         if ! wpa_check "$INTERFACE"; then
             # ignore quirk nodown---is that appropriate? or should we just use report_iproute?
             # this adds a flush call as well---is that appropriate?
-            set_interface forcedown "$INTERFACE"
+            bring_interface forcedown "$INTERFACE"
             report_fail "WPA Authentication/Association Failed"
             return 1
         fi
@@ -122,7 +122,7 @@ ethernet_down() {
     report_debug ethernet_iproute_down if_down
     # ignore quirk nodown---is that appropriate?
     # this adds a flush call as well---is that appropriate?
-    set_interface forcedown "$INTERFACE"
+    bring_interface forcedown "$INTERFACE"
 
 }
 
diff --git a/src/connections/wireless b/src/connections/wireless
index 42504d2..e1d4a44 100644
--- a/src/connections/wireless
+++ b/src/connections/wireless
@@ -42,7 +42,7 @@ wireless_up() {
     fi
 
     report_debug wireless_up ifup
-    set_interface up-old "$INTERFACE" || return 1
+    bring_interface up-old "$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?
-            set_interface forcedown-old "$INTERFACE"
+            bring_interface forcedown-old "$INTERFACE"
         fi
 
         report_debug wireless_up iwconfig "$INTERFACE" $WEP_OPTS
@@ -114,7 +114,7 @@ wireless_up() {
         fi
 
         if quirk "predown"; then # madwifi FS#10585
-           set_interface up-old "$INTERFACE"
+           bring_interface up-old "$INTERFACE"
         fi
 
         report_debug ethernet_up wep_check
@@ -212,7 +212,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?
-    set_interface down-old "$INTERFACE"
+    bring_interface down-old "$INTERFACE"
 
     # Handle wireless kill switches
     # Any reason why a hardware switch should be considered on interface down?
diff --git a/src/network b/src/network
index ba37847..165d6e3 100644
--- a/src/network
+++ b/src/network
@@ -333,7 +333,7 @@ set_iface() {
     fi
 }
 
-set_interface()
+bring_interface()
 {
     INTERFACE="$2"
     case "$1" in