X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=system-linux.c;h=c6f17e99c8015ca7f414231c6a77139c7a522e2e;hp=af54bfd8881306857864c49cbc75ff8b1e4d2dc3;hb=07e9b542017c692ee2abe7a8689517b466150944;hpb=cd23fd6bf7983741b9a72bea78749278716248ec

diff --git a/system-linux.c b/system-linux.c
index af54bfd..c6f17e9 100644
--- a/system-linux.c
+++ b/system-linux.c
@@ -791,7 +791,7 @@ nla_put_failure:
 	return -ENOMEM;
 }
 
-int system_macvlan_del(struct device *macvlan)
+static int system_link_del(struct device *dev)
 {
 	struct nl_msg *msg;
 	struct ifinfomsg iim = {
@@ -805,12 +805,13 @@ int system_macvlan_del(struct device *macvlan)
 		return -1;
 
 	nlmsg_append(msg, &iim, sizeof(iim), 0);
+	nla_put_string(msg, IFLA_IFNAME, dev->ifname);
+	return system_rtnl_call(msg);
+}
 
-	nla_put_string(msg, IFLA_IFNAME, macvlan->ifname);
-
-	system_rtnl_call(msg);
-
-	return 0;
+int system_macvlan_del(struct device *macvlan)
+{
+	return system_link_del(macvlan);
 }
 
 static int system_vlan(struct device *dev, int id)
@@ -896,24 +897,7 @@ nla_put_failure:
 
 int system_vlandev_del(struct device *vlandev)
 {
-	struct nl_msg *msg;
-	struct ifinfomsg iim = {
-		.ifi_family = AF_UNSPEC,
-		.ifi_index = 0,
-	};
-
-	msg = nlmsg_alloc_simple(RTM_DELLINK, NLM_F_REQUEST);
-
-	if (!msg)
-		return -1;
-
-	nlmsg_append(msg, &iim, sizeof(iim), 0);
-
-	nla_put_string(msg, IFLA_IFNAME, vlandev->ifname);
-
-	system_rtnl_call(msg);
-
-	return 0;
+	return system_link_del(vlandev);
 }
 
 static void
@@ -1480,14 +1464,15 @@ bool system_resolve_rt_table(const char *name, unsigned int *id)
 	if (table == RT_TABLE_UNSPEC)
 		return false;
 
-	/* do not consider main table special */
-	if (table == RT_TABLE_MAIN)
-		table = RT_TABLE_UNSPEC;
-
 	*id = table;
 	return true;
 }
 
+bool system_is_default_rt_table(unsigned int id)
+{
+	return (id == RT_TABLE_MAIN);
+}
+
 static int system_iprule(struct iprule *rule, int cmd)
 {
 	int alen = ((rule->flags & IPRULE_FAMILY) == IPRULE_INET4) ? 4 : 16;