Revert "Merge "Add netd support for configuring IPv6 optimistic mode." into lmp-mr1...

This is to undo ag/569594.

This reverts commit 828f8b88c78e7d7c31b098768df403e4596a91d4, reversing
changes made to ac7fefcf3d90cf856b0f1664207d056ed1dd4725.

Bug: 18609055
Bug: 17769720
Change-Id: I120745d9d01d731174f477dff9b463dede8523d7

diff --git a/server/InterfaceController.cpp b/server/InterfaceController.cpp
index b7a4d0b..b38c137 100644 (file)
--- a/server/InterfaceController.cpp
+++ b/server/InterfaceController.cpp
@@ -38,9 +38,6 @@ InterfaceController::InterfaceController() {
        setAcceptRA("2");
 
        setAcceptRARouteTable(-RouteController::ROUTE_TABLE_OFFSET_FROM_INDEX);
-
-       // Enable optimistic DAD for IPv6 addresses on all interfaces.
-       setIPv6OptimisticMode("1");
 }
 
 InterfaceController::~InterfaceController() {
@@ -150,8 +147,3 @@ int InterfaceController::setMtu(const char *interface, const char *mtu)
        free(path);
        return success;
 }
-
-void InterfaceController::setIPv6OptimisticMode(const char *value) {
-       setOnAllInterfaces("optimistic_dad", value);
-       setOnAllInterfaces("use_optimistic", value);
-}

diff --git a/server/InterfaceController.h b/server/InterfaceController.h
index 60e2131..71e4344 100644 (file)
--- a/server/InterfaceController.h
+++ b/server/InterfaceController.h
@@ -32,7 +32,6 @@ class InterfaceController {
        void setOnAllInterfaces(const char* filename, const char* value);
        void setAcceptRA(const char* value);
        void setAcceptRARouteTable(int tableOrOffset);
-       void setIPv6OptimisticMode(const char *value);
 };
 
 #endif