Merge master@5428150 into git_qt-dev-plus-aosp.

Change-Id: I6a8453fa3bf5d87116f15f1fb0237026f4687f78
BUG: 129345239

1 files changed, 5 insertions, 0 deletions

diff --git a/clatd.c b/clatd.c
index 3ccceea..94a0f06 100644
--- a/clatd.c
+++ b/clatd.c
@@ -430,6 +430,11 @@ void read_packet(int read_fd, int write_fd, int to_ipv6) {
   }
 
   uint16_t proto = ntohs(tun_header->proto);
+  if (proto == ETH_P_IPV6) {
+    // kernel IPv6 stack spams us with router/neighbour solication,
+    // multicast group joins, etc. which otherwise fills the log...
+    return;
+  }
   if (proto != ETH_P_IP) {
     logmsg(ANDROID_LOG_WARN, "%s: unknown packet type = 0x%x", __func__, proto);
     return;