commit fe2403cbe3b695c146f1e94722efa218865b82c2
author Andreas Gampe <agampe@google.com> Tue Nov 25 19:58:09 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 25 19:58:09 2014 +0000
tree e0107364cc6e72aecef720d96e740ba2bd5f1343
parent 7a7cfd6b4ebe1d0a12a52d31bdc66a5e576d6e3d
parent fee9afb1a5d9f7f5df0c79e29368c61d7da16fb8

am fee9afb1: Android-Clatd: Remove unused variable

* commit 'fee9afb1a5d9f7f5df0c79e29368c61d7da16fb8':
  Android-Clatd: Remove unused variable

clatd_test.cpp

diff --git a/clatd_test.cpp b/clatd_test.cpp
index 0b6063e..7e218f0 100644
--- a/clatd_test.cpp
+++ b/clatd_test.cpp
@@ -432,7 +432,6 @@
   if (socketpair(AF_UNIX, SOCK_DGRAM | SOCK_NONBLOCK, 0, fds)) {
     abort();
   }
-  struct tun_pi tun_header = { 0, 0 };
 
   char foo[512];
   snprintf(foo, sizeof(foo), "%s: Invalid original packet", msg);
@@ -443,13 +442,11 @@
   int version = ip_version(original);
   switch (version) {
     case 4:
-      tun_header.proto = htons(ETH_P_IP);
       expected_proto = htons(ETH_P_IPV6);
       read_fd = fds[1];
       write_fd = fds[0];
       break;
     case 6:
-      tun_header.proto = htons(ETH_P_IPV6);
       expected_proto = htons(ETH_P_IP);
       read_fd = fds[0];
       write_fd = fds[1];