diff --git a/repos/dde_linux/patches/lxip_ip_config.patch b/repos/dde_linux/patches/lxip_ip_config.patch index febeb7bdaf..3b2bbc8f80 100644 --- a/repos/dde_linux/patches/lxip_ip_config.patch +++ b/repos/dde_linux/patches/lxip_ip_config.patch @@ -1,12 +1,35 @@ -commit 3785e30c9833a908775a69c2961a3c1d6fe50d09 -Author: Sebastian Sumpf -Date: Mon Jun 2 13:25:30 2014 +0200 +ip_config.patch - ip_config.patch +From: Sebastian Sumpf + +--- + net/ipv4/ipconfig.c | 26 ++++++++++++++++---------- + 1 file changed, 16 insertions(+), 10 deletions(-) + +diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c +index 0bc7412..c907f8d 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c -@@ -1516,24 +1516,24 @@ static int __init ip_auto_config(void) +@@ -133,7 +133,7 @@ int ic_proto_enabled __initdata = 0 + static int ic_host_name_set __initdata; /* Host name set by us? */ + + __be32 ic_myaddr = NONE; /* My IP address */ +-static __be32 ic_netmask = NONE; /* Netmask for local subnet */ ++__be32 ic_netmask = NONE; /* Netmask for local subnet */ + __be32 ic_gateway = NONE; /* Gateway IP address */ + + __be32 ic_addrservaddr = NONE; /* IP Address of the IP addresses'server */ +@@ -153,7 +153,7 @@ static char dhcp_client_identifier[253] __initdata; + /* Persistent data: */ + + static int ic_proto_used; /* Protocol used, if any */ +-static __be32 ic_nameservers[CONF_NAMESERVERS_MAX]; /* DNS Server IP addresses */ ++__be32 ic_nameservers[CONF_NAMESERVERS_MAX]; /* DNS Server IP addresses */ + static u8 ic_domain[64]; /* DNS (not NIS) domain name */ + + /* +@@ -1531,24 +1531,24 @@ static int __init ip_auto_config(void) */ pr_info("IP-Config: Complete:\n"); @@ -39,3 +62,16 @@ Date: Mon Jun 2 13:25:30 2014 +0200 pr_cont("\n"); #endif /* !SILENT */ +@@ -1621,6 +1621,12 @@ static int __init ip_auto_config_setup(char *addrs) + ic_set_manually = 1; + ic_enable = 1; + ++ ic_myaddr = NONE; ++ ic_netmask = NONE; ++ ic_gateway = NONE; ++ ic_servaddr = NONE; ++ ic_got_reply = 0; ++ + /* + * If any dhcp, bootp etc options are set, leave autoconfig on + * and skip the below static IP processing. diff --git a/repos/dde_linux/ports/dde_linux.hash b/repos/dde_linux/ports/dde_linux.hash index fb09d5c5b7..714730a28e 100644 --- a/repos/dde_linux/ports/dde_linux.hash +++ b/repos/dde_linux/ports/dde_linux.hash @@ -1 +1 @@ -1652f5b16e4106d7f283c8bb31a8720891b0e05d +2e9fd79b5d3185327c93e906daee89136260b0e7