X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=system-linux.c;h=9f1aa9efb70e4903d3d1a85a3a8c8596f7c2860c;hp=725723dfbafc3a9a46539c29a9617ba448fbf198;hb=a6e4abcb9687b579dddaa4ba4b08d4e5124a8101;hpb=76a04646be82ed9b9c80d86ac25b151bce36bffa

diff --git a/system-linux.c b/system-linux.c
index 725723d..9f1aa9e 100644
--- a/system-linux.c
+++ b/system-linux.c
@@ -5,6 +5,7 @@
 #include <linux/rtnetlink.h>
 #include <linux/sockios.h>
 #include <linux/if_vlan.h>
+#include <linux/if_bridge.h>
 
 #include <unistd.h>
 #include <string.h>
@@ -121,22 +122,25 @@ int system_bridge_delbr(struct device *bridge)
 	return ioctl(sock_ioctl, SIOCBRDELBR, bridge->ifname);
 }
 
-static int system_bridge_if(const char *bridge, struct device *dev, int cmd)
+static int system_bridge_if(const char *bridge, struct device *dev, int cmd, void *data)
 {
 	struct ifreq ifr;
-	ifr.ifr_ifindex = dev->ifindex;
+	if (dev)
+		ifr.ifr_ifindex = dev->ifindex;
+	else
+		ifr.ifr_data = data;
 	strncpy(ifr.ifr_name, bridge, sizeof(ifr.ifr_name));
 	return ioctl(sock_ioctl, cmd, &ifr);
 }
 
 int system_bridge_addif(struct device *bridge, struct device *dev)
 {
-	return system_bridge_if(bridge->ifname, dev, SIOCBRADDIF);
+	return system_bridge_if(bridge->ifname, dev, SIOCBRADDIF, NULL);
 }
 
 int system_bridge_delif(struct device *bridge, struct device *dev)
 {
-	return system_bridge_if(bridge->ifname, dev, SIOCBRDELIF);
+	return system_bridge_if(bridge->ifname, dev, SIOCBRDELIF, NULL);
 }
 
 static bool system_is_bridge(const char *name, char *buf, int buflen)
@@ -198,7 +202,7 @@ static int system_if_flags(const char *ifname, unsigned add, unsigned rem)
 /*
  * Clear bridge (membership) state and bring down device
  */
-static void system_if_clear_state(struct device *dev)
+void system_if_clear_state(struct device *dev)
 {
 	char buf[256];
 	char *bridge;
@@ -218,14 +222,50 @@ static void system_if_clear_state(struct device *dev)
 	bridge = system_get_bridge(dev->ifname, buf, sizeof(buf));
 	if (bridge) {
 		D(SYSTEM, "Remove device '%s' from bridge '%s'\n", dev->ifname, bridge);
-		system_bridge_if(bridge, dev, SIOCBRDELIF);
+		system_bridge_if(bridge, dev, SIOCBRDELIF, NULL);
 	}
 }
 
-int system_bridge_addbr(struct device *bridge)
+static inline unsigned long
+sec_to_jiffies(int val)
+{
+	return (unsigned long) val * 100;
+}
+
+int system_bridge_addbr(struct device *bridge, struct bridge_config *cfg)
 {
-	system_if_clear_state(bridge);
-	return ioctl(sock_ioctl, SIOCBRADDBR, bridge->ifname);
+	unsigned long args[4] = {};
+
+	if (ioctl(sock_ioctl, SIOCBRADDBR, bridge->ifname) < 0)
+		return -1;
+
+	args[0] = BRCTL_SET_BRIDGE_STP_STATE;
+	args[1] = !!cfg->stp;
+	system_bridge_if(bridge->ifname, NULL, SIOCDEVPRIVATE, &args);
+
+	args[0] = BRCTL_SET_BRIDGE_FORWARD_DELAY;
+	args[1] = sec_to_jiffies(cfg->forward_delay);
+	system_bridge_if(bridge->ifname, NULL, SIOCDEVPRIVATE, &args);
+
+	if (cfg->flags & BRIDGE_OPT_AGEING_TIME) {
+		args[0] = BRCTL_SET_AGEING_TIME;
+		args[1] = sec_to_jiffies(cfg->ageing_time);
+		system_bridge_if(bridge->ifname, NULL, SIOCDEVPRIVATE, &args);
+	}
+
+	if (cfg->flags & BRIDGE_OPT_HELLO_TIME) {
+		args[0] = BRCTL_SET_BRIDGE_HELLO_TIME;
+		args[1] = sec_to_jiffies(cfg->hello_time);
+		system_bridge_if(bridge->ifname, NULL, SIOCDEVPRIVATE, &args);
+	}
+
+	if (cfg->flags & BRIDGE_OPT_MAX_AGE) {
+		args[0] = BRCTL_SET_BRIDGE_MAX_AGE;
+		args[1] = sec_to_jiffies(cfg->max_age);
+		system_bridge_if(bridge->ifname, NULL, SIOCDEVPRIVATE, &args);
+	}
+
+	return 0;
 }
 
 static int system_vlan(struct device *dev, int id)
@@ -250,7 +290,6 @@ static int system_vlan(struct device *dev, int id)
 
 int system_vlan_add(struct device *dev, int id)
 {
-	system_if_clear_state(dev);
 	return system_vlan(dev, id);
 }
 
@@ -272,7 +311,6 @@ int system_if_down(struct device *dev)
 
 int system_if_check(struct device *dev)
 {
-	system_if_clear_state(dev);
 	device_set_present(dev, (system_if_resolve(dev) >= 0));
 	return 0;
 }