From: Sonic Zhang <sonic.zhang@analog.com>
Date: Wed, 11 Sep 2013 03:31:53 +0000 (+0800)
Subject: netpoll: Should handle ETH_P_ARP other than ETH_P_IP in netpoll_neigh_reply
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0885f6b8bb0403a56546d302e749c1defe47339d;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

netpoll: Should handle ETH_P_ARP other than ETH_P_IP in netpoll_neigh_reply

[ Upstream commit b0dd663b60944a3ce86430fa35549fb37968bda0 ]

The received ARP request type in the Ethernet packet head is ETH_P_ARP other than ETH_P_IP.

[ Bug introduced by commit b7394d2429c198b1da3d46ac39192e891029ec0f
  ("netpoll: prepare for ipv6") ]

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index cec074be8c43..1a8666ba4ef7 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -550,7 +550,7 @@ static void netpoll_neigh_reply(struct sk_buff *skb, struct netpoll_info *npinfo
 		return;
 
 	proto = ntohs(eth_hdr(skb)->h_proto);
-	if (proto == ETH_P_IP) {
+	if (proto == ETH_P_ARP) {
 		struct arphdr *arp;
 		unsigned char *arp_ptr;
 		/* No arp on this interface */