bridge: add support for configuring extra tagged vlans on member devices

[project/netifd.git] / system-dummy.c

diff --git a/system-dummy.c b/system-dummy.c
index 4ad9db521126302ece6b68ca300449d8092c79b9..84382b3a9ad9d0f9ebb5883a1ecf0b3b24c9d4a4 100644 (file)
--- a/system-dummy.c
+++ b/system-dummy.c
@@ -55,17 +55,36 @@ int system_bridge_delif(struct device *bridge, struct device *dev)
        return 0;
 }
 
-int system_bridge_vlan(const char *iface, uint16_t vid, bool add, unsigned int vflags)
+int system_bridge_vlan(const char *iface, uint16_t vid, int16_t vid_end, bool add, unsigned int vflags)
 {
-       D(SYSTEM, "brctl vlan %s %s %s vid=%d pvid=%d untag=%d\n",
+       D(SYSTEM, "brctl vlan %s %s %s vid=%d vid_end=%d pvid=%d untag=%d\n",
          add ? "add" : "remove",
          (vflags & BRVLAN_F_SELF) ? "self" : "master",
-         iface, vid,
+         iface, vid, vid_end,
          !!(vflags & BRVLAN_F_PVID),
          !!(vflags & BRVLAN_F_UNTAGGED));
        return 0;
 }
 
+void system_bridge_set_stp_state(struct device *dev, bool val)
+{
+}
+
+int system_bridge_vlan_check(struct device *dev, char *ifname)
+{
+       return 0;
+}
+
+int system_bonding_set_device(struct device *dev, struct bonding_config *cfg)
+{
+       return 0;
+}
+
+int system_bonding_set_port(struct device *dev, struct device *port, bool add, bool primary)
+{
+       return 0;
+}
+
 int system_link_netns_move(struct device *dev, int netns_fd, const char *target_ifname)
 {
        D(SYSTEM, "ip link set %s name %s netns %d\n", dev->ifname, target_ifname, netns_fd);
@@ -157,9 +176,11 @@ system_if_dump_stats(struct device *dev, struct blob_buf *b)
 }
 
 void
-system_if_apply_settings(struct device *dev, struct device_settings *s, unsigned int apply_mask)
+system_if_apply_settings(struct device *dev, struct device_settings *s, uint64_t apply_mask)
 {
-       if ((s->flags & DEV_OPT_MACADDR & apply_mask) && !dev->external) {
+       apply_mask &= s->flags;
+
+       if ((apply_mask & (DEV_OPT_MACADDR | DEV_OPT_DEFAULT_MACADDR)) && !dev->external) {
                D(SYSTEM, "ifconfig %s hw ether %s\n",
                  dev->ifname, format_macaddr(s->macaddr));
        }
@@ -314,12 +335,12 @@ time_t system_get_rtime(void)
        return 0;
 }
 
-int system_del_ip_tunnel(const char *name, struct blob_attr *attr)
+int system_del_ip_tunnel(const struct device *dev)
 {
        return 0;
 }
 
-int system_add_ip_tunnel(const char *name, struct blob_attr *attr)
+int system_add_ip_tunnel(const struct device *dev, struct blob_attr *attr)
 {
        return 0;
 }