Commit a40c9f88b5e3da500ddab9440e5ddac170c12281
Committed by
David S. Miller
David S. Miller
1 parent
5a6f95e653
Exists in
master
and in
7 other branches
net: add some KERN_CONT markers to continuation lines
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>
Showing 2 changed files with 18 additions and 18 deletions Side-by-side Diff
drivers/net/phy/phy.c
| ... | ... | @@ -47,11 +47,11 @@ |
| 47 | 47 | pr_info("PHY: %s - Link is %s", dev_name(&phydev->dev), |
| 48 | 48 | phydev->link ? "Up" : "Down"); |
| 49 | 49 | if (phydev->link) |
| 50 | - printk(" - %d/%s", phydev->speed, | |
| 50 | + printk(KERN_CONT " - %d/%s", phydev->speed, | |
| 51 | 51 | DUPLEX_FULL == phydev->duplex ? |
| 52 | 52 | "Full" : "Half"); |
| 53 | 53 | |
| 54 | - printk("\n"); | |
| 54 | + printk(KERN_CONT "\n"); | |
| 55 | 55 | } |
| 56 | 56 | EXPORT_SYMBOL(phy_print_status); |
| 57 | 57 |
net/ipv4/ipconfig.c
| ... | ... | @@ -1191,13 +1191,13 @@ |
| 1191 | 1191 | (ic_proto_enabled & IC_USE_DHCP) && |
| 1192 | 1192 | ic_dhcp_msgtype != DHCPACK) { |
| 1193 | 1193 | ic_got_reply = 0; |
| 1194 | - printk(","); | |
| 1194 | + printk(KERN_CONT ","); | |
| 1195 | 1195 | continue; |
| 1196 | 1196 | } |
| 1197 | 1197 | #endif /* IPCONFIG_DHCP */ |
| 1198 | 1198 | |
| 1199 | 1199 | if (ic_got_reply) { |
| 1200 | - printk(" OK\n"); | |
| 1200 | + printk(KERN_CONT " OK\n"); | |
| 1201 | 1201 | break; |
| 1202 | 1202 | } |
| 1203 | 1203 | |
| ... | ... | @@ -1205,7 +1205,7 @@ |
| 1205 | 1205 | continue; |
| 1206 | 1206 | |
| 1207 | 1207 | if (! --retries) { |
| 1208 | - printk(" timed out!\n"); | |
| 1208 | + printk(KERN_CONT " timed out!\n"); | |
| 1209 | 1209 | break; |
| 1210 | 1210 | } |
| 1211 | 1211 | |
| ... | ... | @@ -1215,7 +1215,7 @@ |
| 1215 | 1215 | if (timeout > CONF_TIMEOUT_MAX) |
| 1216 | 1216 | timeout = CONF_TIMEOUT_MAX; |
| 1217 | 1217 | |
| 1218 | - printk("."); | |
| 1218 | + printk(KERN_CONT "."); | |
| 1219 | 1219 | } |
| 1220 | 1220 | |
| 1221 | 1221 | #ifdef IPCONFIG_BOOTP |
| ... | ... | @@ -1236,7 +1236,7 @@ |
| 1236 | 1236 | ((ic_got_reply & IC_RARP) ? "RARP" |
| 1237 | 1237 | : (ic_proto_enabled & IC_USE_DHCP) ? "DHCP" : "BOOTP"), |
| 1238 | 1238 | &ic_servaddr); |
| 1239 | - printk("my address is %pI4\n", &ic_myaddr); | |
| 1239 | + printk(KERN_CONT "my address is %pI4\n", &ic_myaddr); | |
| 1240 | 1240 | |
| 1241 | 1241 | return 0; |
| 1242 | 1242 | } |
| 1243 | 1243 | |
| 1244 | 1244 | |
| ... | ... | @@ -1468,19 +1468,19 @@ |
| 1468 | 1468 | /* |
| 1469 | 1469 | * Clue in the operator. |
| 1470 | 1470 | */ |
| 1471 | - printk("IP-Config: Complete:"); | |
| 1472 | - printk("\n device=%s", ic_dev->name); | |
| 1473 | - printk(", addr=%pI4", &ic_myaddr); | |
| 1474 | - printk(", mask=%pI4", &ic_netmask); | |
| 1475 | - printk(", gw=%pI4", &ic_gateway); | |
| 1476 | - printk(",\n host=%s, domain=%s, nis-domain=%s", | |
| 1471 | + printk("IP-Config: Complete:\n"); | |
| 1472 | + printk(" device=%s", ic_dev->name); | |
| 1473 | + printk(KERN_CONT ", addr=%pI4", &ic_myaddr); | |
| 1474 | + printk(KERN_CONT ", mask=%pI4", &ic_netmask); | |
| 1475 | + printk(KERN_CONT ", gw=%pI4", &ic_gateway); | |
| 1476 | + printk(KERN_CONT ",\n host=%s, domain=%s, nis-domain=%s", | |
| 1477 | 1477 | utsname()->nodename, ic_domain, utsname()->domainname); |
| 1478 | - printk(",\n bootserver=%pI4", &ic_servaddr); | |
| 1479 | - printk(", rootserver=%pI4", &root_server_addr); | |
| 1480 | - printk(", rootpath=%s", root_server_path); | |
| 1478 | + printk(KERN_CONT ",\n bootserver=%pI4", &ic_servaddr); | |
| 1479 | + printk(KERN_CONT ", rootserver=%pI4", &root_server_addr); | |
| 1480 | + printk(KERN_CONT ", rootpath=%s", root_server_path); | |
| 1481 | 1481 | if (ic_dev_mtu) |
| 1482 | - printk(", mtu=%d", ic_dev_mtu); | |
| 1483 | - printk("\n"); | |
| 1482 | + printk(KERN_CONT ", mtu=%d", ic_dev_mtu); | |
| 1483 | + printk(KERN_CONT "\n"); | |
| 1484 | 1484 | #endif /* !SILENT */ |
| 1485 | 1485 | |
| 1486 | 1486 | return 0; |