mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/e1000e/ich8lan.c
This commit is contained in:
commit
eb14f01959
197 changed files with 3729 additions and 2520 deletions
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in a new issue