diff options
| author | David S. Miller <davem@davemloft.net> | 2017-06-10 14:06:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-10 14:06:46 -0700 |
| commit | 95c4629d92d15d10e5f7c55bfb72583f96a91374 (patch) | |
| tree | ef9b973bfbf9f85659f4fc2794d8271bd19c4857 /net/ipv4/arp.c | |
| parent | 60925ee97e2be4993fb7a2f7e70be0fbce08cf0f (diff) | |
| parent | 5faab9e0f03c4eef97886b45436015e107f79f5f (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Diffstat (limited to 'net/ipv4/arp.c')
| -rw-r--r-- | net/ipv4/arp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c index ae96e6f3e0cb..e9f3386a528b 100644 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c @@ -863,8 +863,8 @@ static int arp_process(struct net *net, struct sock *sk, struct sk_buff *skb) n = __neigh_lookup(&arp_tbl, &sip, dev, 0); + addr_type = -1; if (n || IN_DEV_ARP_ACCEPT(in_dev)) { - addr_type = -1; is_garp = arp_is_garp(net, dev, &addr_type, arp->ar_op, sip, tip, sha, tha); } |