lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:

	drivers/net/e1000e/ich8lan.c
This commit is contained in:
David S. Miller
2008-12-15 20:03:50 -08:00
parent 9a4a84294b a3dd15444b
commit eb14f01959
197 changed files with 3874 additions and 2665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net/ipv6/ndisc.c
View File

@@ -947,8 +947,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);