shill: Only deregister ethernet service if it's valid.
BUG=chromium-os:35933
TEST=Run any test that sets up a backchannel
Change-Id: I938490b3ee20149eee087c8872d4b49e0b74396c
Reviewed-on: https://gerrit.chromium.org/gerrit/37054
Reviewed-by: Christopher Wiley <wiley@chromium.org>
Commit-Ready: Thieu Le <thieule@chromium.org>
Tested-by: Thieu Le <thieule@chromium.org>
diff --git a/ethernet.cc b/ethernet.cc
index fc4b8fe..4f0c08d 100644
--- a/ethernet.cc
+++ b/ethernet.cc
@@ -85,7 +85,8 @@
} else if ((flags & IFF_LOWER_UP) == 0 && link_up_) {
link_up_ = false;
DestroyIPConfig();
- manager()->DeregisterService(service_);
+ if (service_)
+ manager()->DeregisterService(service_);
SelectService(NULL);
}
}