diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-12-16 17:10:35 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-16 17:10:35 -0500 |
| commit | 16e842a62a8ffcc2e51def6ef9fd6e0926539bc5 (patch) | |
| tree | 2cf6c23ab195e68712bca51351c1d37ed950c55d /net/ipv6 | |
| parent | 525352eb6d355bef6adf597252fc6d04f2dbe66c (diff) | |
| parent | 42245e65f356ed54fdf7a1f9a0095e0bc40f73a3 (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/addrconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 76ff9f4fe8..73a23b4130 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
| @@ -379,8 +379,8 @@ static struct inet6_dev * ipv6_add_dev(struct net_device *dev) | |||
| 379 | dev->type == ARPHRD_NONE || | 379 | dev->type == ARPHRD_NONE || |
| 380 | dev->type == ARPHRD_SIT) { | 380 | dev->type == ARPHRD_SIT) { |
| 381 | printk(KERN_INFO | 381 | printk(KERN_INFO |
| 382 | "Disabled Privacy Extensions on device %p(%s)\n", | 382 | "%s: Disabled Privacy Extensions\n", |
| 383 | dev, dev->name); | 383 | dev->name); |
| 384 | ndev->cnf.use_tempaddr = -1; | 384 | ndev->cnf.use_tempaddr = -1; |
| 385 | } else { | 385 | } else { |
| 386 | in6_dev_hold(ndev); | 386 | in6_dev_hold(ndev); |