Merge remote branch 'upstream/master'

1 files changed, 13 insertions, 4 deletions

diff --git a/etc/rc.newwanip b/etc/rc.newwanip
index ad3a54d..fc8c802 100755
--- a/etc/rc.newwanip
+++ b/etc/rc.newwanip
@@ -89,16 +89,25 @@ $oldip = "0.0.0.0";
 if (file_exists("{$g['vardb_path']}/{$interface}_cacheip"))
 	$oldip = file_get_contents("{$g['vardb_path']}/{$interface}_cacheip");
 
-$grouptmp = link_interface_to_group($interface);
-if (!empty($grouptmp))
-	array_walk($grouptmp, 'interface_group_add_member');
-
 /* regenerate resolv.conf if DNS overrides are allowed */
 system_resolvconf_generate(true);
 
 /* write current WAN IP to file */
 file_put_contents("{$g['vardb_path']}/{$interface}_ip", $curwanip);
 
+unset($gre);
+$gre = link_interface_to_gre($interface);
+if (!empty($gre))
+	array_walk($gre, 'interface_gre_configure');
+unset($gif);
+$gif = link_interface_to_gif($interface);
+if (!empty($gif))
+	array_walk($gif, 'interface_gif_configure');
+
+$grouptmp = link_interface_to_group($interface);
+if (!empty($grouptmp))
+	array_walk($grouptmp, 'interface_group_add_member');
+
 /* reconfigure static routes (kernel may have deleted them) */
 system_routing_configure($interface);