git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://neil.brown.name/md
[pandora-kernel.git]
/
net
/
bridge
/
br_private.h
diff --git
a/net/bridge/br_private.h
b/net/bridge/br_private.h
index
857a021
..
d7d6fb0
100644
(file)
--- a/
net/bridge/br_private.h
+++ b/
net/bridge/br_private.h
@@
-29,6
+29,11
@@
#define BR_VERSION "2.3"
#define BR_VERSION "2.3"
+/* Control of forwarding link local multicast */
+#define BR_GROUPFWD_DEFAULT 0
+/* Don't allow forwarding control protocols like STP and LLDP */
+#define BR_GROUPFWD_RESTRICTED 0x4007u
+
/* Path to usermode spanning tree program */
#define BR_STP_PROG "/sbin/bridge-stp"
/* Path to usermode spanning tree program */
#define BR_STP_PROG "/sbin/bridge-stp"
@@
-193,6
+198,8
@@
struct net_bridge
unsigned long flags;
#define BR_SET_MAC_ADDR 0x00000001
unsigned long flags;
#define BR_SET_MAC_ADDR 0x00000001
+ u16 group_fwd_mask;
+
/* STP */
bridge_id designated_root;
bridge_id bridge_id;
/* STP */
bridge_id designated_root;
bridge_id bridge_id;