diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-18 16:28:31 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-18 16:28:31 -0800 |
| commit | a5db219f4cf9f67995eabd53b81a1232c82f5852 (patch) | |
| tree | 5fffcb7ebd543b39468822963f9190fe6bf41bff /net/ipv6 | |
| parent | c56eb8fb6dccb83d9fe62fd4dc00c834de9bc470 (diff) | |
| parent | ff76015f3bdfbc482c723cb4f2559cef84d178ca (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/addrconf.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 5b189c97c2f..24a1cf110d8 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -420,9 +420,6 @@ static struct inet6_dev * ipv6_add_dev(struct net_device *dev) dev->type == ARPHRD_TUNNEL6 || dev->type == ARPHRD_SIT || dev->type == ARPHRD_NONE) { - printk(KERN_INFO - "%s: Disabled Privacy Extensions\n", - dev->name); ndev->cnf.use_tempaddr = -1; } else { in6_dev_hold(ndev); |