commit b3954a74f592c103a7ce610b72b0fa8e3ade7ba0
author Mike Mu <mikemu@google.com> Mon Dec 19 19:32:53 2016 +0000
committer Mike Mu <mikemu@google.com> Mon Dec 19 23:19:04 2016 +0000
tree 614b8157b1262b5acfcbbf7b3c31c10aea6e90df
parent c0d7aad107915d7eb6c94c0a2c3e7291cdd72194

Revert "Wait for MAC address before adding interface to bridge."

This reverts commit a973dab269b080477dda34baa0201052a8027e11.

Change-Id: Ie300070d9289df27541b13d6c44bd97867dbdafe

fs/skeleton/etc/init.d/network

diff --git a/fs/skeleton/etc/init.d/network b/fs/skeleton/etc/init.d/network
index b36a2da..3899412 100755
--- a/fs/skeleton/etc/init.d/network
+++ b/fs/skeleton/etc/init.d/network
@@ -229,14 +229,6 @@
   for x in "$@"; do
     [ -e "$x" ] || continue
 
-    # Wait for MAC address.
-    for i in $(seq 1 12); do
-      if [ "$(get_mac_address_for_interface "$x")" != 00:00:00:00:00:00 ]; then
-        break
-      fi
-      sleep 0.25
-    done
-
     local x="${x#/sys/class/net/}"
     echo "Adding interface $x..."
 
@@ -428,7 +420,7 @@
       i=0
       while true; do
         if ! interface_exists wlan"$i"; then
-          echo "add wlan$i 3" >/sys/class/net/quantenna/vlan
+          add_quantenna_interface "wlan$i" 3
           break
         fi
         i=$((i+1))

fs/skeleton/etc/utils.sh

diff --git a/fs/skeleton/etc/utils.sh b/fs/skeleton/etc/utils.sh
index e4f4b9c..17470b1 100644
--- a/fs/skeleton/etc/utils.sh
+++ b/fs/skeleton/etc/utils.sh
@@ -265,6 +265,18 @@
   [ -e "/sys/class/net/$1" ]
 }
 
+add_quantenna_interface() {
+  local interface=$1
+  local vlan=$2
+  echo "add $interface $vlan" >/sys/class/net/quantenna/vlan
+  for i in `seq 12`; do
+    if interface_exists "$interface"; then
+      break
+    fi
+    sleep 0.25
+  done
+}
+
 is_quantenna_interface() {
   # Check for "$1 " to prevent "wlanX" from matching "wlanX_portal".
   filecontains "$1 " /sys/class/net/quantenna/vlan >/dev/null 2>&1

fs/skeleton/sbin/hotplug

diff --git a/fs/skeleton/sbin/hotplug b/fs/skeleton/sbin/hotplug
index dbb0da8..7cec68c 100755
--- a/fs/skeleton/sbin/hotplug
+++ b/fs/skeleton/sbin/hotplug
@@ -18,7 +18,7 @@
   local client_interface=$(echo "$interface" | sed s/^wlan/wcli/)
   if ! interface_exists "$client_interface"; then
     if is_quantenna_interface "$interface"; then
-      echo "add $client_interface 2" >/sys/class/net/quantenna/vlan
+      add_quantenna_interface "$client_interface" 2
       mac=$(get_locally_administered_mac_addr "$mac")
     else
       local phy=$(find_phy_for_interface "$interface")
@@ -76,7 +76,7 @@
 
   if ! interface_exists "$secondary_interface"; then
     if is_quantenna_interface "$interface"; then
-      echo "add $secondary_interface 4" >/sys/class/net/quantenna/vlan
+      add_quantenna_interface "$secondary_interface" 4
       mac=$(get_locally_administered_mac_addr "$mac")
     else
       local phy=$(find_phy_for_interface "$interface")