lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-17 01:54:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "interfaces: issues with assigned gif/gre tunnels #5540"

Browse Source 
This reverts commit a7b446f6d3e676cd5b94aa916ceefdf631facbfc.

Overly cautious:  the code still handles this by reloading a
GIF/GRE/bridge internally.
This commit is contained in:
Franco Fichtner 2022-03-11 08:48:56 +01:00
parent a7b446f6d3
commit c474bb3e62
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/etc/inc/interfaces.inc
View File

@ -2230,26 +2230,6 @@ function interface_configure($verbose = false, $interface = 'wan', $reload = fal
/* XXX maybe spoofmac, media and promisc can live here too? */
configure_interface_hardware($realhwif, $ifconfig_details);
/*
* Make sure tunnel address is set when interface is configured as
* these lie outside the normal ipaddr/ipaddrv6 configuration schema.
*
* Actually this does not fix what the previous comment states:
*
* Here we repair the situation where virtual devices have been
* set up before their dependent interfaces have actually been
* configured before they are allowed to be configured due to
* long dependency: hwdev -> lan -> gifdev -> opt1
*
* For legacy reasons opt1 is configured before lan due to IPv6
* tracking decisions in interfaces_configure() which leads to
* a defunct tunnel if we do not restart it here.
*
* Eventually this should go away as the second half of ticket #5540.
*/
interfaces_gre_configure($realhwif);
interfaces_gif_configure($realhwif);
switch ($wancfg['ipaddr']) {
case 'dhcp':
interface_dhcp_configure($interface);