Changeset 17086

Timestamp:

05/17/11 19:08:39 (2 years ago)

Author:

chris

Message:

brigdge isolate mode

Location:

src/linux/xscale/linux-2.6.34.6/net/bridge

Files:

• br_forward.c (modified) (5 diffs)
• br_input.c (modified) (1 diff)
• br_private.h (modified) (1 diff)
• br_sysfs_if.c (modified) (2 diffs)

src/linux/xscale/linux-2.6.34.6/net/bridge/br_forward.c

@@ -125 +125 @@
 void br_forward(const struct net_bridge_port *to, struct sk_buff *skb, struct sk_buff *skb0)
 {
-        if (should_deliver(to, skb)) {
+        if (should_deliver(to, skb) && !(to->flags & BR_ISOLATE_MODE)) {
                 if (skb0)
                         deliver_clone(to, skb, __br_forward);
@@ -180 +180 @@
                      struct sk_buff *skb0,
                      void (*__packet_hook)(const struct net_bridge_port *p,
-                                           struct sk_buff *skb))
+                                           struct sk_buff *skb),
+                     bool forward)
 {
         struct net_bridge_port *p;
@@ -188 +189 @@
 
         list_for_each_entry_rcu(p, &br->port_list, list) {
+                if (forward && (p->flags & BR_ISOLATE_MODE))
+                        continue;
+
                 prev = maybe_deliver(prev, p, skb, __packet_hook);
                 if (IS_ERR(prev))
@@ -211 +215 @@
 void br_flood_deliver(struct net_bridge *br, struct sk_buff *skb)
 {
-        br_flood(br, skb, NULL, __br_deliver);
+        br_flood(br, skb, NULL, __br_deliver, false);
 }
 
@@ -218 +222 @@
                       struct sk_buff *skb2)
 {
-        br_flood(br, skb, skb2, __br_forward);
+        br_flood(br, skb, skb2, __br_forward, true);
 }
 

src/linux/xscale/linux-2.6.34.6/net/bridge/br_input.c

@@ -88 +88 @@
 
                 br->dev->stats.multicast++;
-        } else if ((dst = __br_fdb_get(br, dest)) && dst->is_local) {
+        } else if ((p->flags & BR_ISOLATE_MODE) ||
+                   ((dst = __br_fdb_get(br, dest)) && dst->is_local)) {
                 skb2 = skb;
                 /* Do not forward the packet since it's local. */

src/linux/xscale/linux-2.6.34.6/net/bridge/br_private.h

@@ -120 +120 @@
         unsigned long                   flags;
 #define BR_HAIRPIN_MODE         0x00000001
+#define BR_ISOLATE_MODE         0x00000002
 
 #ifdef CONFIG_BRIDGE_IGMP_SNOOPING

src/linux/xscale/linux-2.6.34.6/net/bridge/br_sysfs_if.c

@@ -159 +159 @@
 static BRPORT_ATTR(hairpin_mode, S_IRUGO | S_IWUSR,
                    show_hairpin_mode, store_hairpin_mode);
+
+static ssize_t show_isolate_mode(struct net_bridge_port *p, char *buf)
+{
+        int isolate_mode = (p->flags & BR_ISOLATE_MODE) ? 1 : 0;
+        return sprintf(buf, "%d\n", isolate_mode);
+}
+static ssize_t store_isolate_mode(struct net_bridge_port *p, unsigned long v)
+{
+        if (v)
+                p->flags |= BR_ISOLATE_MODE;
+        else
+                p->flags &= ~BR_ISOLATE_MODE;
+        return 0;
+}
+static BRPORT_ATTR(isolate_mode, S_IRUGO | S_IWUSR,
+                   show_isolate_mode, store_isolate_mode);
 
 #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
@@ -192 +208 @@
         &brport_attr_flush,
         &brport_attr_hairpin_mode,
+        &brport_attr_isolate_mode,
 #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
         &brport_attr_multicast_router,