Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c1c36b0 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by David S. Miller
Browse files

net/ipv4/ipconfig: Rejoin broken lines in console output 



Commit 09605cc1 ("net ipv4: use preferred log methods") replaced
a few calls of pr_cont() after a console print without a trailing
newline by pr_info(), causing lines to be split during IP
autoconfiguration, like:

    .
    ,
     OK
    IP-Config: Got DHCP answer from 192.168.97.254,
    my address is 192.168.97.44

Convert these back to using pr_cont(), so it prints again:

    ., OK
    IP-Config: Got DHCP answer from 192.168.97.254, my address is 192.168.97.44

Absorb the printing of "my address ..." into the previous call to
pr_info(), as there's no reason to use a continuation there.

Convert one more pr_info() to print nameservers while we're at it.

Fixes: 09605cc1 ("net ipv4: use preferred log methods")
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 85beabfe

net/ipv4/ipconfig.c

+9 −10
Original line number Original line Diff line number Diff line
@@ -1239,13 +1239,13 @@ static int __init ic_dynamic(void) 
		    (ic_proto_enabled & IC_USE_DHCP) &&

		    (ic_proto_enabled & IC_USE_DHCP) &&

		    ic_dhcp_msgtype != DHCPACK) {

		    ic_dhcp_msgtype != DHCPACK) {

			ic_got_reply = 0;

			ic_got_reply = 0;

			pr_notice(",");

			pr_cont(",");

			continue;

			continue;

		}

		}

#endif /* IPCONFIG_DHCP */

#endif /* IPCONFIG_DHCP */





		if (ic_got_reply) {

		if (ic_got_reply) {

			pr_notice(" OK\n");

			pr_cont(" OK\n");

			break;

			break;

		}

		}
@@ -1253,7 +1253,7 @@ static int __init ic_dynamic(void) 
			continue;

			continue;





		if (! --retries) {

		if (! --retries) {

			pr_notice(" timed out!\n");

			pr_cont(" timed out!\n");

			break;

			break;

		}

		}
@@ -1263,7 +1263,7 @@ static int __init ic_dynamic(void) 
		if (timeout > CONF_TIMEOUT_MAX)

		if (timeout > CONF_TIMEOUT_MAX)

			timeout = CONF_TIMEOUT_MAX;

			timeout = CONF_TIMEOUT_MAX;





		pr_notice(".");

		pr_cont(".");

	}

	}





#ifdef IPCONFIG_BOOTP

#ifdef IPCONFIG_BOOTP
@@ -1280,11 +1280,10 @@ static int __init ic_dynamic(void) 
		return -1;

		return -1;

	}

	}





	pr_info("IP-Config: Got %s answer from %pI4, ",

	pr_info("IP-Config: Got %s answer from %pI4, my address is %pI4\n",

		((ic_got_reply & IC_RARP) ? "RARP"

		((ic_got_reply & IC_RARP) ? "RARP"

		: (ic_proto_enabled & IC_USE_DHCP) ? "DHCP" : "BOOTP"),

		: (ic_proto_enabled & IC_USE_DHCP) ? "DHCP" : "BOOTP"),

		&ic_addrservaddr);

		&ic_addrservaddr, &ic_myaddr);

	pr_info("my address is %pI4\n", &ic_myaddr);





	return 0;

	return 0;

}

}
@@ -1527,14 +1526,14 @@ static int __init ip_auto_config(void) 
		pr_cont(", mtu=%d", ic_dev_mtu);

		pr_cont(", mtu=%d", ic_dev_mtu);

	for (i = 0; i < CONF_NAMESERVERS_MAX; i++)

	for (i = 0; i < CONF_NAMESERVERS_MAX; i++)

		if (ic_nameservers[i] != NONE) {

		if (ic_nameservers[i] != NONE) {

			pr_info("     nameserver%u=%pI4",

			pr_cont("     nameserver%u=%pI4",

				i, &ic_nameservers[i]);

				i, &ic_nameservers[i]);

			break;

			break;

		}

		}

	for (i++; i < CONF_NAMESERVERS_MAX; i++)

	for (i++; i < CONF_NAMESERVERS_MAX; i++)

		if (ic_nameservers[i] != NONE)

		if (ic_nameservers[i] != NONE)

			pr_info(", nameserver%u=%pI4", i, &ic_nameservers[i]);

			pr_cont(", nameserver%u=%pI4", i, &ic_nameservers[i]);

	pr_info("\n");

	pr_cont("\n");

#endif /* !SILENT */

#endif /* !SILENT */





	return 0;

	return 0;