commit ddf62a13a066039782e4cb67c256b1489c46ed1f
author jp abgrall <jpa@google.com> Tue Sep 11 21:13:29 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 11 21:13:29 2012 -0700
tree 69d7fe945af6de3bf046f20e389119fe3531a0c1
parent e0f6082cf6f08c180ee2ef9fa90830068ff40804
parent 40cdfe48dbf95d4cef7bbd47bd0c0e72f72bd390

am 40cdfe48: am 78b00d81: Merge "Don\'t include <linux/...> header files directly."

* commit '40cdfe48dbf95d4cef7bbd47bd0c0e72f72bd390':
  Don't include <linux/...> header files directly.

ResolverController.cpp

diff --git a/ResolverController.cpp b/ResolverController.cpp
index 680be20..23554e8 100644
--- a/ResolverController.cpp
+++ b/ResolverController.cpp
@@ -19,7 +19,7 @@
 
 #include <cutils/log.h>
 
-#include <linux/if.h>
+#include <net/if.h>
 
 // NOTE: <resolv_iface.h> is a private C library header that provides
 //       declarations for _resolv_set_default_iface() and others.

SecondaryTableController.h

diff --git a/SecondaryTableController.h b/SecondaryTableController.h
index 58914df..79e0592 100644
--- a/SecondaryTableController.h
+++ b/SecondaryTableController.h
@@ -19,7 +19,7 @@
 
 #include <sysutils/FrameworkListener.h>
 
-#include <linux/if.h>
+#include <net/if.h>
 
 #ifndef IFNAMSIZ
 #define IFNAMSIZ 16

TetherController.h

diff --git a/TetherController.h b/TetherController.h
index 463774b..d3106eb 100644
--- a/TetherController.h
+++ b/TetherController.h
@@ -17,7 +17,7 @@
 #ifndef _TETHER_CONTROLLER_H
 #define _TETHER_CONTROLLER_H
 
-#include <linux/in.h>
+#include <netinet/in.h>
 
 #include "List.h"