From 0e2a816f0005909f931c4c52f59766cfdb0d4e88 Mon Sep 17 00:00:00 2001 From: Jan Sembera Date: Tue, 9 Dec 2008 15:48:32 -0800 Subject: [PATCH] --- yaml --- r: 119883 b: refs/heads/master c: 24fc7b86dc0470616803be2f921c8cd5c459175d h: refs/heads/master i: 119881: cc745b76b4de534d69fcfbfa6bbbb0df21e91667 119879: eee6f80ebaffd57010ee7cfd74a7a517f770618a v: v3 --- [refs] | 2 +- trunk/net/ipv6/ndisc.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index af18224ed713..ba388a20c0ff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fbf0229e946deb9e6c711f9eaa5c8d670c3a28fd +refs/heads/master: 24fc7b86dc0470616803be2f921c8cd5c459175d diff --git a/trunk/net/ipv6/ndisc.c b/trunk/net/ipv6/ndisc.c index 172438320eec..d0f54d18e19b 100644 --- a/trunk/net/ipv6/ndisc.c +++ b/trunk/net/ipv6/ndisc.c @@ -912,8 +912,13 @@ static void ndisc_recv_na(struct sk_buff *skb) is invalid, but ndisc specs say nothing about it. It could be misconfiguration, or an smart proxy agent tries to help us :-) + + We should not print the error if NA has been + received from loopback - it is just our own + unsolicited advertisement. */ - ND_PRINTK1(KERN_WARNING + if (skb->pkt_type != PACKET_LOOPBACK) + ND_PRINTK1(KERN_WARNING "ICMPv6 NA: someone advertises our address on %s!\n", ifp->idev->dev->name); in6_ifa_put(ifp);