From df8b3fb65b143174a4d197219644e00fd29a764b Mon Sep 17 00:00:00 2001
From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Date: Wed, 7 Nov 2012 05:05:38 +0000
Subject: [PATCH] --- yaml --- r: 340693 b: refs/heads/master c:
 b20b6d972624ff024023012e38a067cb5086270e h: refs/heads/master i:   340691:
 599931add77d1a69fbf7393e7f14739385f17f72 v: v3

---
 [refs]                 | 2 +-
 trunk/net/ipv6/ndisc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index eeef795fa9ff..919d58dfa1a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85894866bcc396162906c0b95c0eadd00c13efbd
+refs/heads/master: b20b6d972624ff024023012e38a067cb5086270e
diff --git a/trunk/net/ipv6/ndisc.c b/trunk/net/ipv6/ndisc.c
index ae0cf818a8f0..a2e50dc46dc9 100644
--- a/trunk/net/ipv6/ndisc.c
+++ b/trunk/net/ipv6/ndisc.c
@@ -906,7 +906,7 @@ static void ndisc_recv_na(struct sk_buff *skb)
 		if (lladdr && !memcmp(lladdr, dev->dev_addr, dev->addr_len) &&
 		    net->ipv6.devconf_all->forwarding && net->ipv6.devconf_all->proxy_ndp &&
 		    pneigh_lookup(&nd_tbl, net, &msg->target, dev, 0)) {
-			/* XXX: idev->cnf.prixy_ndp */
+			/* XXX: idev->cnf.proxy_ndp */
 			goto out;
 		}