diff options
author | Sonic Zhang <sonic.zhang@analog.com> | 2013-09-10 23:31:53 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-09-12 17:19:14 -0400 |
commit | b0dd663b60944a3ce86430fa35549fb37968bda0 (patch) | |
tree | 73a414c4ac51dbc77a3ecafff5d6dfb7fa86b9d2 /net | |
parent | c7cb020d0b670428eddd9702dfdc5ff0a48de653 (diff) |
netpoll: Should handle ETH_P_ARP other than ETH_P_IP in netpoll_neigh_reply
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>
Diffstat (limited to 'net')
-rw-r--r-- | net/core/netpoll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 2c637e9a0b27..c3c7b27c112d 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 | |||
550 | return; | 550 | return; |
551 | 551 | ||
552 | proto = ntohs(eth_hdr(skb)->h_proto); | 552 | proto = ntohs(eth_hdr(skb)->h_proto); |
553 | if (proto == ETH_P_IP) { | 553 | if (proto == ETH_P_ARP) { |
554 | struct arphdr *arp; | 554 | struct arphdr *arp; |
555 | unsigned char *arp_ptr; | 555 | unsigned char *arp_ptr; |
556 | /* No arp on this interface */ | 556 | /* No arp on this interface */ |