diff options
| author | Christopher Grant <cjgrant@google.com> | 2016-01-06 13:54:12 -0500 |
|---|---|---|
| committer | Peter Qiu <zqiu@google.com> | 2016-01-19 23:06:49 +0000 |
| commit | d92c35390c2309645b82f37c6172e4fae606b095 (patch) | |
| tree | 0b6ed142c8f5ae1da1bb8de2d8730995c396abef | |
| parent | 5912d505fc9b4cf9d7b22385919a67653e81d551 (diff) | |
| download | shill-d92c35390c2309645b82f37c6172e4fae606b095.tar.gz | |
shill: do not require MAC addresses on ignored ethernet devices
Bug: 26424002
TEST=Unit tests, manual testing.
Change-Id: Ie1e8487c5138164eebbd9d0f5ea85b7c3ef03b73
| -rw-r--r-- | device_info.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/device_info.cc b/device_info.cc index 89229f28..1d1714af 100644 --- a/device_info.cc +++ b/device_info.cc @@ -1167,8 +1167,10 @@ void DeviceInfo::DelayedDeviceCreationTask() { string address = base::StringToLowerASCII(infos_[dev_index].mac_address.HexEncode()); - if (technology != Technology::kTunnel) + if (technology != Technology::kTunnel && + technology != Technology::kUnknown) { DCHECK(!address.empty()); + } DeviceRefPtr device = CreateDevice(link_name, address, dev_index, technology); |