merge in jb-mr1-release history after reset to jb-mr1-dev
diff --git a/InterfaceController.cpp b/InterfaceController.cpp
index 25200e9..e02b517 100644
--- a/InterfaceController.cpp
+++ b/InterfaceController.cpp
@@ -46,7 +46,7 @@
libh_ = dlopen(if_cmd_lib_file_name, RTLD_NOW | RTLD_LOCAL);
if (libh_ == NULL) {
const char *err_str = dlerror();
- ALOGE("Error (%s) while opening the net interface command library", err_str ? err_str : "unknown");
+ ALOGW("Warning (%s) while opening the net interface command library", err_str ? err_str : "unknown");
} else {
sendCommandInit_ = (int (*)(void))dlsym(libh_, set_cmd_init_func_name);
if (sendCommandInit_ == NULL) {
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.
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
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"
