diff options
Diffstat (limited to 'net/ipv6/addrconf.c')
-rw-r--r-- | net/ipv6/addrconf.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 8eeec6eb2bd3..84c358804355 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -3495,8 +3495,8 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event, | |||
3495 | 3495 | ||
3496 | if (!addrconf_link_ready(dev)) { | 3496 | if (!addrconf_link_ready(dev)) { |
3497 | /* device is not ready yet. */ | 3497 | /* device is not ready yet. */ |
3498 | pr_info("ADDRCONF(NETDEV_UP): %s: link is not ready\n", | 3498 | pr_debug("ADDRCONF(NETDEV_UP): %s: link is not ready\n", |
3499 | dev->name); | 3499 | dev->name); |
3500 | break; | 3500 | break; |
3501 | } | 3501 | } |
3502 | 3502 | ||
@@ -5120,6 +5120,8 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb, | |||
5120 | if (idev) { | 5120 | if (idev) { |
5121 | err = in6_dump_addrs(idev, skb, cb, s_ip_idx, | 5121 | err = in6_dump_addrs(idev, skb, cb, s_ip_idx, |
5122 | &fillargs); | 5122 | &fillargs); |
5123 | if (err > 0) | ||
5124 | err = 0; | ||
5123 | } | 5125 | } |
5124 | goto put_tgt_net; | 5126 | goto put_tgt_net; |
5125 | } | 5127 | } |
@@ -5154,7 +5156,7 @@ put_tgt_net: | |||
5154 | if (fillargs.netnsid >= 0) | 5156 | if (fillargs.netnsid >= 0) |
5155 | put_net(tgt_net); | 5157 | put_net(tgt_net); |
5156 | 5158 | ||
5157 | return err < 0 ? err : skb->len; | 5159 | return skb->len ? : err; |
5158 | } | 5160 | } |
5159 | 5161 | ||
5160 | static int inet6_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb) | 5162 | static int inet6_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb) |