| From dc4b6f759a581e7eee285c62508859abea77c42f Mon Sep 17 00:00:00 2001 |
| From: Sonic Zhang <sonic.zhang@analog.com> |
| Date: Wed, 11 Sep 2013 11:31:53 +0800 |
| Subject: netpoll: Should handle ETH_P_ARP other than ETH_P_IP in netpoll_neigh_reply |
| |
| From: Sonic Zhang <sonic.zhang@analog.com> |
| |
| [ 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> |
| --- |
| net/core/netpoll.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/net/core/netpoll.c |
| +++ b/net/core/netpoll.c |
| @@ -550,7 +550,7 @@ static void netpoll_neigh_reply(struct s |
| 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 */ |
