1 files changed, 284 insertions, 3 deletions

diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c
index ee4820aa1843..dd321e39e621 100644
--- a/net/bridge/br_sysfs_br.c
+++ b/net/bridge/br_sysfs_br.c
@@ -316,9 +316,9 @@ static ssize_t store_group_addr(struct device *d,
         if (new_addr[5] & ~0xf)
                 return -EINVAL;
 
-        if (new_addr[5] == 1    /* 802.3x Pause address */
-            || new_addr[5] == 2 /* 802.3ad Slow protocols */
-            || new_addr[5] == 3) /* 802.1X PAE address */
+        if (new_addr[5] == 1 ||         /* 802.3x Pause address */
+            new_addr[5] == 2 ||         /* 802.3ad Slow protocols */
+            new_addr[5] == 3)           /* 802.1X PAE address */
                 return -EINVAL;
 
         spin_lock_bh(&br->lock);
@@ -345,6 +345,273 @@ static ssize_t store_flush(struct device *d,
 }
 static DEVICE_ATTR(flush, S_IWUSR, NULL, store_flush);
 
+#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
+static ssize_t show_multicast_router(struct device *d,
+                                     struct device_attribute *attr, char *buf)
+{
+        struct net_bridge *br = to_bridge(d);
+        return sprintf(buf, "%d\n", br->multicast_router);
+}
+
+static ssize_t store_multicast_router(struct device *d,
+                                      struct device_attribute *attr,
+                                      const char *buf, size_t len)
+{
+        return store_bridge_parm(d, buf, len, br_multicast_set_router);
+}
+static DEVICE_ATTR(multicast_router, S_IRUGO | S_IWUSR, show_multicast_router,
+                   store_multicast_router);
+
+static ssize_t show_multicast_snooping(struct device *d,
+                                       struct device_attribute *attr,
+                                       char *buf)
+{
+        struct net_bridge *br = to_bridge(d);
+        return sprintf(buf, "%d\n", !br->multicast_disabled);
+}
+
+static ssize_t store_multicast_snooping(struct device *d,
+                                        struct device_attribute *attr,
+                                        const char *buf, size_t len)
+{
+        return store_bridge_parm(d, buf, len, br_multicast_toggle);
+}
+static DEVICE_ATTR(multicast_snooping, S_IRUGO | S_IWUSR,
+                   show_multicast_snooping, store_multicast_snooping);
+
+static ssize_t show_hash_elasticity(struct device *d,
+                                    struct device_attribute *attr, char *buf)
+{
+        struct net_bridge *br = to_bridge(d);
+        return sprintf(buf, "%u\n", br->hash_elasticity);
+}
+
+static int set_elasticity(struct net_bridge *br, unsigned long val)
+{
+        br->hash_elasticity = val;
+        return 0;
+}
+
+static ssize_t store_hash_elasticity(struct device *d,
+                                     struct device_attribute *attr,
+                                     const char *buf, size_t len)
+{
+        return store_bridge_parm(d, buf, len, set_elasticity);
+}
+static DEVICE_ATTR(hash_elasticity, S_IRUGO | S_IWUSR, show_hash_elasticity,
+                   store_hash_elasticity);
+
+static ssize_t show_hash_max(struct device *d, struct device_attribute *attr,
+                             char *buf)
+{
+        struct net_bridge *br = to_bridge(d);
+        return sprintf(buf, "%u\n", br->hash_max);
+}
+
+static ssize_t store_hash_max(struct device *d, struct device_attribute *attr,
+                              const char *buf, size_t len)
+{
+        return store_bridge_parm(d, buf, len, br_multicast_set_hash_max);
+}
+static DEVICE_ATTR(hash_max, S_IRUGO | S_IWUSR, show_hash_max,
+                   store_hash_max);
+
+static ssize_t show_multicast_last_member_count(struct device *d,
+                                                struct device_attribute *attr,
+                                                char *buf)
+{
+        struct net_bridge *br = to_bridge(d);
+        return sprintf(buf, "%u\n", br->multicast_last_member_count);
+}
+
+static int set_last_member_count(struct net_bridge *br, unsigned long val)
+{
+        br->multicast_last_member_count = val;
+        return 0;
+}
+
+static ssize_t store_multicast_last_member_count(struct device *d,
+                                                 struct device_attribute *attr,
+                                                 const char *buf, size_t len)
+{
+        return store_bridge_parm(d, buf, len, set_last_member_count);
+}
+static DEVICE_ATTR(multicast_last_member_count, S_IRUGO | S_IWUSR,
+                   show_multicast_last_member_count,
+                   store_multicast_last_member_count);
+
+static ssize_t show_multicast_startup_query_count(
+        struct device *d, struct device_attribute *attr, char *buf)
+{
+        struct net_bridge *br = to_bridge(d);
+        return sprintf(buf, "%u\n", br->multicast_startup_query_count);
+}
+
+static int set_startup_query_count(struct net_bridge *br, unsigned long val)
+{
+        br->multicast_startup_query_count = val;
+        return 0;
+}
+
+static ssize_t store_multicast_startup_query_count(
+        struct device *d, struct device_attribute *attr, const char *buf,
+        size_t len)
+{
+        return store_bridge_parm(d, buf, len, set_startup_query_count);
+}
+static DEVICE_ATTR(multicast_startup_query_count, S_IRUGO | S_IWUSR,
+                   show_multicast_startup_query_count,
+                   store_multicast_startup_query_count);
+
+static ssize_t show_multicast_last_member_interval(
+        struct device *d, struct device_attribute *attr, char *buf)
+{
+        struct net_bridge *br = to_bridge(d);
+        return sprintf(buf, "%lu\n",
+                       jiffies_to_clock_t(br->multicast_last_member_interval));
+}
+
+static int set_last_member_interval(struct net_bridge *br, unsigned long val)
+{
+        br->multicast_last_member_interval = clock_t_to_jiffies(val);
+        return 0;
+}
+
+static ssize_t store_multicast_last_member_interval(
+        struct device *d, struct device_attribute *attr, const char *buf,
+        size_t len)
+{
+        return store_bridge_parm(d, buf, len, set_last_member_interval);
+}
+static DEVICE_ATTR(multicast_last_member_interval, S_IRUGO | S_IWUSR,
+                   show_multicast_last_member_interval,
+                   store_multicast_last_member_interval);
+
+static ssize_t show_multicast_membership_interval(
+        struct device *d, struct device_attribute *attr, char *buf)
+{
+        struct net_bridge *br = to_bridge(d);
+        return sprintf(buf, "%lu\n",
+                       jiffies_to_clock_t(br->multicast_membership_interval));
+}
+
+static int set_membership_interval(struct net_bridge *br, unsigned long val)
+{
+        br->multicast_membership_interval = clock_t_to_jiffies(val);
+        return 0;
+}
+
+static ssize_t store_multicast_membership_interval(
+        struct device *d, struct device_attribute *attr, const char *buf,
+        size_t len)
+{
+        return store_bridge_parm(d, buf, len, set_membership_interval);
+}
+static DEVICE_ATTR(multicast_membership_interval, S_IRUGO | S_IWUSR,
+                   show_multicast_membership_interval,
+                   store_multicast_membership_interval);
+
+static ssize_t show_multicast_querier_interval(struct device *d,
+                                               struct device_attribute *attr,
+                                               char *buf)
+{
+        struct net_bridge *br = to_bridge(d);
+        return sprintf(buf, "%lu\n",
+                       jiffies_to_clock_t(br->multicast_querier_interval));
+}
+
+static int set_querier_interval(struct net_bridge *br, unsigned long val)
+{
+        br->multicast_querier_interval = clock_t_to_jiffies(val);
+        return 0;
+}
+
+static ssize_t store_multicast_querier_interval(struct device *d,
+                                                struct device_attribute *attr,
+                                                const char *buf, size_t len)
+{
+        return store_bridge_parm(d, buf, len, set_querier_interval);
+}
+static DEVICE_ATTR(multicast_querier_interval, S_IRUGO | S_IWUSR,
+                   show_multicast_querier_interval,
+                   store_multicast_querier_interval);
+
+static ssize_t show_multicast_query_interval(struct device *d,
+                                             struct device_attribute *attr,
+                                             char *buf)
+{
+        struct net_bridge *br = to_bridge(d);
+        return sprintf(buf, "%lu\n",
+                       jiffies_to_clock_t(br->multicast_query_interval));
+}
+
+static int set_query_interval(struct net_bridge *br, unsigned long val)
+{
+        br->multicast_query_interval = clock_t_to_jiffies(val);
+        return 0;
+}
+
+static ssize_t store_multicast_query_interval(struct device *d,
+                                              struct device_attribute *attr,
+                                              const char *buf, size_t len)
+{
+        return store_bridge_parm(d, buf, len, set_query_interval);
+}
+static DEVICE_ATTR(multicast_query_interval, S_IRUGO | S_IWUSR,
+                   show_multicast_query_interval,
+                   store_multicast_query_interval);
+
+static ssize_t show_multicast_query_response_interval(
+        struct device *d, struct device_attribute *attr, char *buf)
+{
+        struct net_bridge *br = to_bridge(d);
+        return sprintf(
+                buf, "%lu\n",
+                jiffies_to_clock_t(br->multicast_query_response_interval));
+}
+
+static int set_query_response_interval(struct net_bridge *br, unsigned long val)
+{
+        br->multicast_query_response_interval = clock_t_to_jiffies(val);
+        return 0;
+}
+
+static ssize_t store_multicast_query_response_interval(
+        struct device *d, struct device_attribute *attr, const char *buf,
+        size_t len)
+{
+        return store_bridge_parm(d, buf, len, set_query_response_interval);
+}
+static DEVICE_ATTR(multicast_query_response_interval, S_IRUGO | S_IWUSR,
+                   show_multicast_query_response_interval,
+                   store_multicast_query_response_interval);
+
+static ssize_t show_multicast_startup_query_interval(
+        struct device *d, struct device_attribute *attr, char *buf)
+{
+        struct net_bridge *br = to_bridge(d);
+        return sprintf(
+                buf, "%lu\n",
+                jiffies_to_clock_t(br->multicast_startup_query_interval));
+}
+
+static int set_startup_query_interval(struct net_bridge *br, unsigned long val)
+{
+        br->multicast_startup_query_interval = clock_t_to_jiffies(val);
+        return 0;
+}
+
+static ssize_t store_multicast_startup_query_interval(
+        struct device *d, struct device_attribute *attr, const char *buf,
+        size_t len)
+{
+        return store_bridge_parm(d, buf, len, set_startup_query_interval);
+}
+static DEVICE_ATTR(multicast_startup_query_interval, S_IRUGO | S_IWUSR,
+                   show_multicast_startup_query_interval,
+                   store_multicast_startup_query_interval);
+#endif
+
 static struct attribute *bridge_attrs[] = {
         &dev_attr_forward_delay.attr,
         &dev_attr_hello_time.attr,
@@ -364,6 +631,20 @@ static struct attribute *bridge_attrs[] = {
         &dev_attr_gc_timer.attr,
         &dev_attr_group_addr.attr,
         &dev_attr_flush.attr,
+#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
+        &dev_attr_multicast_router.attr,
+        &dev_attr_multicast_snooping.attr,
+        &dev_attr_hash_elasticity.attr,
+        &dev_attr_hash_max.attr,
+        &dev_attr_multicast_last_member_count.attr,
+        &dev_attr_multicast_startup_query_count.attr,
+        &dev_attr_multicast_last_member_interval.attr,
+        &dev_attr_multicast_membership_interval.attr,
+        &dev_attr_multicast_querier_interval.attr,
+        &dev_attr_multicast_query_interval.attr,
+        &dev_attr_multicast_query_response_interval.attr,
+        &dev_attr_multicast_startup_query_interval.attr,
+#endif
         NULL
 };