commit 78b00d81ebb7e2720fe17c116bcfd086bdd1f4e7
author jp abgrall <jpa@google.com> Tue Sep 11 20:38:42 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Tue Sep 11 20:38:43 2012 -0700
tree c1a5728c5301692756d69abcdf6e0fed75c69783
parent 8a3da263f9fde42efbc54d19465ebd1f83ba35cd
parent 970274a61800e047430d81269df977de9dbe45ef

Merge "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 eef94fe..398a8e5 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"