From ef8e0b9491467cf8d49fa3af7d43f12e3bd524e4 Mon Sep 17 00:00:00 2001
From: Pierre Couillaud <pierre@broadcom.com>
Date: Wed, 11 Feb 2015 08:55:29 -0800
Subject: eth: make sure dhcp is stopped before bringing up interface.

Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
Signed-off-by: Blair Prescott <blairp@broadcom.com>
---
 java/com/android/server/ethernet/EthernetNetworkFactory.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/java/com/android/server/ethernet/EthernetNetworkFactory.java b/java/com/android/server/ethernet/EthernetNetworkFactory.java
index 2d0a957..2de3cea 100644
--- a/java/com/android/server/ethernet/EthernetNetworkFactory.java
+++ b/java/com/android/server/ethernet/EthernetNetworkFactory.java
@@ -167,6 +167,7 @@ class EthernetNetworkFactory {
     private void setInterfaceUp(String iface) {
         // Bring up the interface so we get link status indications.
         try {
+            NetworkUtils.stopDhcp(iface);
             mNMService.setInterfaceUp(iface);
             String hwAddr = null;
             InterfaceConfiguration config = mNMService.getInterfaceConfig(iface);
-- 
cgit v1.2.3