Skip to content

Commit

Permalink
net: add some KERN_CONT markers to continuation lines
Browse files Browse the repository at this point in the history
Cc: netdev@vger.kernel.org
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Uwe Kleine-König authored and David S. Miller committed Nov 28, 2010
1 parent 5a6f95e commit a40c9f8
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions drivers/net/phy/phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ void phy_print_status(struct phy_device *phydev)
pr_info("PHY: %s - Link is %s", dev_name(&phydev->dev),
phydev->link ? "Up" : "Down");
if (phydev->link)
printk(" - %d/%s", phydev->speed,
printk(KERN_CONT " - %d/%s", phydev->speed,
DUPLEX_FULL == phydev->duplex ?
"Full" : "Half");

printk("\n");
printk(KERN_CONT "\n");
}
EXPORT_SYMBOL(phy_print_status);

Expand Down
32 changes: 16 additions & 16 deletions net/ipv4/ipconfig.c
Original file line number Diff line number Diff line change
Expand Up @@ -1191,21 +1191,21 @@ static int __init ic_dynamic(void)
(ic_proto_enabled & IC_USE_DHCP) &&
ic_dhcp_msgtype != DHCPACK) {
ic_got_reply = 0;
printk(",");
printk(KERN_CONT ",");
continue;
}
#endif /* IPCONFIG_DHCP */

if (ic_got_reply) {
printk(" OK\n");
printk(KERN_CONT " OK\n");
break;
}

if ((d = d->next))
continue;

if (! --retries) {
printk(" timed out!\n");
printk(KERN_CONT " timed out!\n");
break;
}

Expand All @@ -1215,7 +1215,7 @@ static int __init ic_dynamic(void)
if (timeout > CONF_TIMEOUT_MAX)
timeout = CONF_TIMEOUT_MAX;

printk(".");
printk(KERN_CONT ".");
}

#ifdef IPCONFIG_BOOTP
Expand All @@ -1236,7 +1236,7 @@ static int __init ic_dynamic(void)
((ic_got_reply & IC_RARP) ? "RARP"
: (ic_proto_enabled & IC_USE_DHCP) ? "DHCP" : "BOOTP"),
&ic_servaddr);
printk("my address is %pI4\n", &ic_myaddr);
printk(KERN_CONT "my address is %pI4\n", &ic_myaddr);

return 0;
}
Expand Down Expand Up @@ -1468,19 +1468,19 @@ static int __init ip_auto_config(void)
/*
* Clue in the operator.
*/
printk("IP-Config: Complete:");
printk("\n device=%s", ic_dev->name);
printk(", addr=%pI4", &ic_myaddr);
printk(", mask=%pI4", &ic_netmask);
printk(", gw=%pI4", &ic_gateway);
printk(",\n host=%s, domain=%s, nis-domain=%s",
printk("IP-Config: Complete:\n");
printk(" device=%s", ic_dev->name);
printk(KERN_CONT ", addr=%pI4", &ic_myaddr);
printk(KERN_CONT ", mask=%pI4", &ic_netmask);
printk(KERN_CONT ", gw=%pI4", &ic_gateway);
printk(KERN_CONT ",\n host=%s, domain=%s, nis-domain=%s",
utsname()->nodename, ic_domain, utsname()->domainname);
printk(",\n bootserver=%pI4", &ic_servaddr);
printk(", rootserver=%pI4", &root_server_addr);
printk(", rootpath=%s", root_server_path);
printk(KERN_CONT ",\n bootserver=%pI4", &ic_servaddr);
printk(KERN_CONT ", rootserver=%pI4", &root_server_addr);
printk(KERN_CONT ", rootpath=%s", root_server_path);
if (ic_dev_mtu)
printk(", mtu=%d", ic_dev_mtu);
printk("\n");
printk(KERN_CONT ", mtu=%d", ic_dev_mtu);
printk(KERN_CONT "\n");
#endif /* !SILENT */

return 0;
Expand Down

0 comments on commit a40c9f8

Please sign in to comment.