aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshemminger <shemminger>2004-05-11 21:51:03 +0000
committershemminger <shemminger>2004-05-11 21:51:03 +0000
commitd096e74ee50c94fa588ef2f0447c1ba022f7b196 (patch)
tree40d7dd37d3452ae743a4bca7e9d8f4973f8b6a71
parent1fab1238fe40be2428302fc3d92d573d3c6fae3d (diff)
downloadandroid_external_brctl-d096e74ee50c94fa588ef2f0447c1ba022f7b196.tar.gz
android_external_brctl-d096e74ee50c94fa588ef2f0447c1ba022f7b196.tar.bz2
android_external_brctl-d096e74ee50c94fa588ef2f0447c1ba022f7b196.zip
Fix RPM build
-rw-r--r--libbridge/libbridge_devif.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libbridge/libbridge_devif.c b/libbridge/libbridge_devif.c
index d4f5265..ef947b6 100644
--- a/libbridge/libbridge_devif.c
+++ b/libbridge/libbridge_devif.c
@@ -21,6 +21,7 @@
#include <errno.h>
#include <string.h>
#include <sys/fcntl.h>
+#include <linux/sockios.h>
#include <sys/ioctl.h>
#include <sys/time.h>
@@ -40,14 +41,15 @@ int br_device_ioctl(const struct bridge *br, unsigned long arg0,
strncpy(ifr.ifr_name, br->ifname, IFNAMSIZ);
((unsigned long *)(&ifr.ifr_data))[0] = (unsigned long)args;
+
#ifdef SIOCBRDEV
+ /* New interface which allows 32bit/64 bit compatiability to work. */
{ int err = ioctl(br_socket_fd, SIOCBRDEV, &ifr);
if (err >= 0)
return err;
}
-#else
-#warn SIOCBRDEV not defined
#endif
+ /* Old fall back */
return ioctl(br_socket_fd, SIOCDEVPRIVATE, &ifr);
}