aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@linux-foundation.org>2007-11-26 08:59:11 -0800
committerStephen Hemminger <shemminger@linux-foundation.org>2007-11-26 08:59:11 -0800
commit6907ae6731516f3fcc508ba8d6dc187604383eb5 (patch)
treebff5648717c5ef3a95a8e4581079d819a5a770af
parent973d2dcb4874f74b792858baa0687a0a1f133eff (diff)
downloadandroid_external_brctl-6907ae6731516f3fcc508ba8d6dc187604383eb5.tar.gz
android_external_brctl-6907ae6731516f3fcc508ba8d6dc187604383eb5.tar.bz2
android_external_brctl-6907ae6731516f3fcc508ba8d6dc187604383eb5.zip
Use linux/if.h rather than net/if.h for compatiablity with
other headers. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
-rw-r--r--libbridge/libbridge.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h
index 20d5bb5..016acea 100644
--- a/libbridge/libbridge.h
+++ b/libbridge/libbridge.h
@@ -19,9 +19,15 @@
#ifndef _LIBBRIDGE_H
#define _LIBBRIDGE_H
-#include <net/if.h>
+#include <sys/socket.h>
+#include <linux/if.h>
#include <linux/if_bridge.h>
+/* defined in net/if.h but that conflicts with linux/if.h... */
+extern unsigned int if_nametoindex (const char *__ifname);
+extern char *if_indextoname (unsigned int __ifindex, char *__ifname);
+
+
struct bridge_id
{
unsigned char prio[2];