X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=system.h;h=9a2326bb3bf67915ed083fcddd699873e856297d;hp=1b16bb900393d58734d865d7390723ca37db3e60;hb=fb2f843edf44c6f12b636cd82cdd1c71e953495f;hpb=2008ae9a80fb82b0018fd510043c291b58e7cc46

diff --git a/system.h b/system.h
index 1b16bb9..9a2326b 100644
--- a/system.h
+++ b/system.h
@@ -25,20 +25,25 @@ enum tunnel_param {
 	TUNNEL_ATTR_TYPE,
 	TUNNEL_ATTR_REMOTE,
 	TUNNEL_ATTR_LOCAL,
+	TUNNEL_ATTR_MTU,
+	TUNNEL_ATTR_DF,
 	TUNNEL_ATTR_TTL,
+	TUNNEL_ATTR_TOS,
 	TUNNEL_ATTR_6RD_PREFIX,
 	TUNNEL_ATTR_6RD_RELAY_PREFIX,
+	TUNNEL_ATTR_LINK,
+	TUNNEL_ATTR_FMRS,
+	TUNNEL_ATTR_INFO,
 	__TUNNEL_ATTR_MAX
 };
 
-const struct config_param_list tunnel_attr_list;
+const struct uci_blob_param_list tunnel_attr_list;
 
 enum bridge_opt {
 	/* stp and forward delay always set */
 	BRIDGE_OPT_AGEING_TIME = (1 << 0),
 	BRIDGE_OPT_HELLO_TIME  = (1 << 1),
 	BRIDGE_OPT_MAX_AGE     = (1 << 2),
-	BRIDGE_OPT_PRIORITY    = (1 << 3),
 };
 
 struct bridge_config {
@@ -47,12 +52,34 @@ struct bridge_config {
 	bool igmp_snoop;
 	unsigned short priority;
 	int forward_delay;
+	bool bridge_empty;
 
 	int ageing_time;
 	int hello_time;
 	int max_age;
 };
 
+enum macvlan_opt {
+	MACVLAN_OPT_MACADDR = (1 << 0),
+};
+
+struct macvlan_config {
+	const char *mode;
+
+	enum macvlan_opt flags;
+	unsigned char macaddr[6];
+};
+
+enum vlan_proto {
+	VLAN_PROTO_8021Q = 0x8100,
+	VLAN_PROTO_8021AD = 0x88A8
+};
+
+struct vlandev_config {
+	enum vlan_proto proto;
+	uint16_t vid;
+};
+
 static inline int system_get_addr_family(unsigned int flags)
 {
 	if ((flags & DEVADDR_FAMILY) == DEVADDR_INET6)
@@ -76,19 +103,27 @@ int system_bridge_delbr(struct device *bridge);
 int system_bridge_addif(struct device *bridge, struct device *dev);
 int system_bridge_delif(struct device *bridge, struct device *dev);
 
+int system_macvlan_add(struct device *macvlan, struct device *dev, struct macvlan_config *cfg);
+int system_macvlan_del(struct device *macvlan);
+
 int system_vlan_add(struct device *dev, int id);
 int system_vlan_del(struct device *dev);
 
+int system_vlandev_add(struct device *vlandev, struct device *dev, struct vlandev_config *cfg);
+int system_vlandev_del(struct device *vlandev);
+
 void system_if_clear_state(struct device *dev);
 int system_if_up(struct device *dev);
 int system_if_down(struct device *dev);
 int system_if_check(struct device *dev);
+int system_if_resolve(struct device *dev);
+
 int system_if_dump_info(struct device *dev, struct blob_buf *b);
 int system_if_dump_stats(struct device *dev, struct blob_buf *b);
 struct device *system_if_get_parent(struct device *dev);
 bool system_if_force_external(const char *ifname);
-void system_if_apply_settings(struct device *dev, struct device_settings *s);
-
+void system_if_apply_settings(struct device *dev, struct device_settings *s,
+			      unsigned int apply_mask);
 
 int system_add_address(struct device *dev, struct device_addr *addr);
 int system_del_address(struct device *dev, struct device_addr *addr);
@@ -97,9 +132,12 @@ int system_add_route(struct device *dev, struct device_route *route);
 int system_del_route(struct device *dev, struct device_route *route);
 int system_flush_routes(void);
 
+bool system_resolve_rt_type(const char *type, unsigned int *id);
 bool system_resolve_rt_table(const char *name, unsigned int *id);
+bool system_is_default_rt_table(unsigned int id);
+bool system_resolve_rpfilter(const char *filter, unsigned int *id);
 
-int system_del_ip_tunnel(const char *name);
+int system_del_ip_tunnel(const char *name, struct blob_attr *attr);
 int system_add_ip_tunnel(const char *name, struct blob_attr *attr);
 
 int system_add_iprule(struct iprule *rule);