summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2004-05-21 23:46:09 -0700
committerStephen Hemminger <shemminger@osdl.org>2004-05-21 23:46:09 -0700
commit5075405c92203b299736e3c625d702d1f32edba2 (patch)
treee5ea23935c47a1e72750e949601db0d42ec58886 /include/linux
parent3d702922fcdda853d1a73ae2b6ea423e8ef453a8 (diff)
[BRIDGE]: New ioctl interface for 32/64 compatability.
Add four new ioctl's for the operations that can't be done through sysfs. The existing bridge ioctl's are multiplexed, and most go through SIOCDEVPRIVATE so they won't work in a mixed 32/64bit environment. The new release of bridge-utils will use these if possible, and fall back to the old interface.
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/if_bridge.h2
-rw-r--r--include/linux/sockios.h6
2 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
index 895775cfb65d..6af157c9763c 100644
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -104,7 +104,7 @@ struct __fdb_entry
#include <linux/netdevice.h>
-extern void brioctl_set(int (*ioctl_hook)(unsigned long));
+extern void brioctl_set(int (*ioctl_hook)(unsigned int, unsigned long));
extern int (*br_handle_frame_hook)(struct sk_buff *skb);
extern int (*br_should_route_hook)(struct sk_buff **pskb);
diff --git a/include/linux/sockios.h b/include/linux/sockios.h
index 2c74362de047..5eb33205cc04 100644
--- a/include/linux/sockios.h
+++ b/include/linux/sockios.h
@@ -116,6 +116,12 @@
#define SIOCBONDINFOQUERY 0x8994 /* rtn info about bond state */
#define SIOCBONDCHANGEACTIVE 0x8995 /* update to a new active slave */
+/* bridge calls */
+#define SIOCBRADDBR 0x89a0 /* create new bridge device */
+#define SIOCBRDELBR 0x89a1 /* remove bridge device */
+#define SIOCBRADDIF 0x89a2 /* add interface to bridge */
+#define SIOCBRDELIF 0x89a3 /* remove interface from bridge */
+
/* Device private ioctl calls */
/*