]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
net/ipv4/ipconfig: Rejoin broken lines in console output
authorGeert Uytterhoeven <geert+renesas@glider.be>
Tue, 24 Nov 2015 13:08:23 +0000 (14:08 +0100)
committerDavid S. Miller <davem@davemloft.net>
Tue, 24 Nov 2015 17:00:09 +0000 (12:00 -0500)
commit6c1c36b02c325ecebce6e3b34bce7f1dfe012cf9
treec64f3d3fd1b89b677987f796798031f8ff6f20d4
parent85beabfeca5343b86057c0d588e33f7975684d37
net/ipv4/ipconfig: Rejoin broken lines in console output

Commit 09605cc12c078306 ("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: 09605cc12c078306 ("net ipv4: use preferred log methods")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ipconfig.c