|
@@ -321,7 +321,7 @@ static void arp_error_report(struct neighbour *neigh, struct sk_buff *skb)
|
|
|
static void arp_solicit(struct neighbour *neigh, struct sk_buff *skb)
|
|
|
{
|
|
|
__be32 saddr = 0;
|
|
|
- u8 dst_ha[MAX_ADDR_LEN];
|
|
|
+ u8 dst_ha[MAX_ADDR_LEN], *dst_hw = NULL;
|
|
|
struct net_device *dev = neigh->dev;
|
|
|
__be32 target = *(__be32 *)neigh->primary_key;
|
|
|
int probes = atomic_read(&neigh->probes);
|
|
@@ -364,8 +364,8 @@ static void arp_solicit(struct neighbour *neigh, struct sk_buff *skb)
|
|
|
if (!(neigh->nud_state & NUD_VALID))
|
|
|
pr_debug("trying to ucast probe in NUD_INVALID\n");
|
|
|
neigh_ha_snapshot(dst_ha, neigh, dev);
|
|
|
+ dst_hw = dst_ha;
|
|
|
} else {
|
|
|
- memset(dst_ha, 0, dev->addr_len);
|
|
|
probes -= neigh->parms->app_probes;
|
|
|
if (probes < 0) {
|
|
|
#ifdef CONFIG_ARPD
|
|
@@ -376,7 +376,7 @@ static void arp_solicit(struct neighbour *neigh, struct sk_buff *skb)
|
|
|
}
|
|
|
|
|
|
arp_send(ARPOP_REQUEST, ETH_P_ARP, target, dev, saddr,
|
|
|
- dst_ha, dev->dev_addr, NULL);
|
|
|
+ dst_hw, dev->dev_addr, NULL);
|
|
|
}
|
|
|
|
|
|
static int arp_ignore(struct in_device *in_dev, __be32 sip, __be32 tip)
|