[PATCH 3.11 26/46] netpoll: fix the skb check in pkt_is_ns

Luis Henriques luis.henriques at canonical.com
Wed Apr 16 10:31:42 UTC 2014


3.11.10.8 -stable review patch.  If anyone has any objections, please let me know.

------------------

From: Li RongQing <roy.qing.li at gmail.com>

[ Not applicable upstream commit, the code here has been removed
  upstream. ]

Neighbor Solicitation is ipv6 protocol, so we should check
skb->protocol with ETH_P_IPV6

Signed-off-by: Li RongQing <roy.qing.li at gmail.com>
Cc: WANG Cong <amwang at redhat.com>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 net/core/netpoll.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 462cdc9..9b40f23 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -740,7 +740,7 @@ static bool pkt_is_ns(struct sk_buff *skb)
 	struct nd_msg *msg;
 	struct ipv6hdr *hdr;
 
-	if (skb->protocol != htons(ETH_P_ARP))
+	if (skb->protocol != htons(ETH_P_IPV6))
 		return false;
 	if (!pskb_may_pull(skb, sizeof(struct ipv6hdr) + sizeof(struct nd_msg)))
 		return false;
-- 
1.9.1





More information about the kernel-team mailing list