commit 1469635367093fb9aba5ed420027cdc30479ecd5
author Manoj Boopathi Raj <manojboopathi@google.com> Wed Dec 06 20:16:19 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 06 20:16:19 2017 +0000
tree c4bd1c743d3e9e08431dd1e615f50a10727bfe5c
parent d9f3a7e620d9f3eed57ccefc4cd4c4a63b0c3f55
parent 820979030b1a7d22d88b2e0db49c4c03a483e8a4

Merge "Remove locks in XfrmController"

server/XfrmController.cpp

diff --git a/server/XfrmController.cpp b/server/XfrmController.cpp
index 99742ec..996c9ec 100644
--- a/server/XfrmController.cpp
+++ b/server/XfrmController.cpp
@@ -386,8 +386,6 @@
     const std::string& cryptAlgo, const std::vector<uint8_t>& cryptKey, int32_t cryptTruncBits,
     const std::string& aeadAlgo, const std::vector<uint8_t>& aeadKey, int32_t aeadIcvBits,
     int32_t encapType, int32_t encapLocalPort, int32_t encapRemotePort) {
-    android::RWLock::AutoWLock lock(mLock);
-
     ALOGD("XfrmController::%s, line=%d", __FUNCTION__, __LINE__);
     ALOGD("transformId=%d", transformId);
     ALOGD("mode=%d", mode);

server/XfrmController.h

diff --git a/server/XfrmController.h b/server/XfrmController.h
index 267edde..7e508a0 100644
--- a/server/XfrmController.h
+++ b/server/XfrmController.h
@@ -26,7 +26,6 @@
 #include <linux/udp.h>
 #include <linux/xfrm.h>
 #include <sysutils/SocketClient.h>
-#include <utils/RWLock.h>
 
 #include "NetdConstants.h"
 #include "netdutils/Status.h"
@@ -194,9 +193,6 @@
     };
 
 private:
-    // prevent concurrent modification of XFRM
-    android::RWLock mLock;
-
 /*
  * Below is a redefinition of the xfrm_usersa_info struct that is part
  * of the Linux uapi <linux/xfrm.h> to align the structures to a 64-bit