bridge: simplify the forward_delay_store by calling store_bridge_parm
authorXin Long <lucien.xin@gmail.com>
Fri, 8 Apr 2016 16:03:29 +0000 (00:03 +0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 14 Apr 2016 02:42:32 +0000 (22:42 -0400)
There are some repetitive codes in forward_delay_store, we can remove
them by calling store_bridge_parm.

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Reviewed-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/bridge/br_sysfs_br.c

index c48f6b0b20229a9c1b8eb032b3d85c7fe58763a1..137cd3bf2565df95fe5f887b5d029037414026df 100644 (file)
@@ -160,29 +160,22 @@ static ssize_t group_fwd_mask_show(struct device *d,
        return sprintf(buf, "%#x\n", br->group_fwd_mask);
 }
 
-
-static ssize_t group_fwd_mask_store(struct device *d,
-                                   struct device_attribute *attr,
-                                   const char *buf,
-                                   size_t len)
+static int set_group_fwd_mask(struct net_bridge *br, unsigned long val)
 {
-       struct net_bridge *br = to_bridge(d);
-       char *endp;
-       unsigned long val;
-
-       if (!ns_capable(dev_net(br->dev)->user_ns, CAP_NET_ADMIN))
-               return -EPERM;
-
-       val = simple_strtoul(buf, &endp, 0);
-       if (endp == buf)
-               return -EINVAL;
-
        if (val & BR_GROUPFWD_RESTRICTED)
                return -EINVAL;
 
        br->group_fwd_mask = val;
 
-       return len;
+       return 0;
+}
+
+static ssize_t group_fwd_mask_store(struct device *d,
+                                   struct device_attribute *attr,
+                                   const char *buf,
+                                   size_t len)
+{
+       return store_bridge_parm(d, buf, len, set_group_fwd_mask);
 }
 static DEVICE_ATTR_RW(group_fwd_mask);