From: Lorenzo Colitti <lorenzo@google.com>
Date: Thu, 12 Sep 2013 15:56:23 +0000 (+0900)
Subject: Don't log "Unexpected netlink message" on NDUSEROPT
X-Git-Tag: android-x86-7.1-r1~209^2~16^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f4e55095146e0b9e8fc0da7c5e0bd6212c486899;p=android-x86%2Fsystem-netd.git

Don't log "Unexpected netlink message" on NDUSEROPT

When opening the netlink socket, NetlinkManager specifies it's
interested in ND_USEROPT messages, but we since we don't have
code to parse them yet, we end up logging an error message for
packets that contain them. Get rid of the logspam by not asking
the kernel to receive them.

[Cherry-pick of a95f8a3426e6a4f17cf41888673f58302781b7be]

Bug: 10718651
Change-Id: Ib1b7748448a983cfa7bb7725e48e238d85152ea2
---

diff --git a/NetlinkManager.cpp b/NetlinkManager.cpp
index 32578a1..d3cffd7 100644
--- a/NetlinkManager.cpp
+++ b/NetlinkManager.cpp
@@ -104,8 +104,7 @@ int NetlinkManager::start() {
     if ((mRouteHandler = setupSocket(&mRouteSock, NETLINK_ROUTE,
                                      RTMGRP_LINK |
                                      RTMGRP_IPV4_IFADDR |
-                                     RTMGRP_IPV6_IFADDR |
-                                     (1 << (RTNLGRP_ND_USEROPT - 1)),
+                                     RTMGRP_IPV6_IFADDR,
          NetlinkListener::NETLINK_FORMAT_BINARY)) == NULL) {
         return -1;
     }