diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
| commit | 91e229bbad6524aabaac8717b2f559283670c37a (patch) | |
| tree | 84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /net/ipv4/ipconfig.c | |
| parent | 6e5e93424dc66542c548dfaa3bfebe30d46d50dd (diff) | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'net/ipv4/ipconfig.c')
| -rw-r--r-- | net/ipv4/ipconfig.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index a52b5853aaa8..10013ccee8dd 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c | |||
| @@ -1390,7 +1390,7 @@ static int __init ip_auto_config(void) | |||
| 1390 | * Clue in the operator. | 1390 | * Clue in the operator. |
| 1391 | */ | 1391 | */ |
| 1392 | printk("IP-Config: Complete:"); | 1392 | printk("IP-Config: Complete:"); |
| 1393 | printk("\n device=%s", ic_dev->name); | 1393 | printk("\n device=%s", ic_dev->name); |
| 1394 | printk(", addr=%u.%u.%u.%u", NIPQUAD(ic_myaddr)); | 1394 | printk(", addr=%u.%u.%u.%u", NIPQUAD(ic_myaddr)); |
| 1395 | printk(", mask=%u.%u.%u.%u", NIPQUAD(ic_netmask)); | 1395 | printk(", mask=%u.%u.%u.%u", NIPQUAD(ic_netmask)); |
| 1396 | printk(", gw=%u.%u.%u.%u", NIPQUAD(ic_gateway)); | 1396 | printk(", gw=%u.%u.%u.%u", NIPQUAD(ic_gateway)); |