|
@@ -1348,8 +1348,9 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip, int arpi
|
|
|
else
|
|
|
netdev = nesvnic->netdev;
|
|
|
|
|
|
+ neigh = dst_neigh_lookup(&rt->dst, &dst_ip);
|
|
|
+
|
|
|
rcu_read_lock();
|
|
|
- neigh = dst_get_neighbour_noref(&rt->dst);
|
|
|
if (neigh) {
|
|
|
if (neigh->nud_state & NUD_VALID) {
|
|
|
nes_debug(NES_DBG_CM, "Neighbor MAC address for 0x%08X"
|
|
@@ -1360,8 +1361,7 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip, int arpi
|
|
|
if (!memcmp(nesadapter->arp_table[arpindex].mac_addr,
|
|
|
neigh->ha, ETH_ALEN)) {
|
|
|
/* Mac address same as in nes_arp_table */
|
|
|
- ip_rt_put(rt);
|
|
|
- return rc;
|
|
|
+ goto out;
|
|
|
}
|
|
|
|
|
|
nes_manage_arp_cache(nesvnic->netdev,
|
|
@@ -1377,7 +1377,12 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip, int arpi
|
|
|
neigh_event_send(neigh, NULL);
|
|
|
}
|
|
|
}
|
|
|
+out:
|
|
|
rcu_read_unlock();
|
|
|
+
|
|
|
+ if (neigh)
|
|
|
+ neigh_release(neigh);
|
|
|
+
|
|
|
ip_rt_put(rt);
|
|
|
return rc;
|
|
|
}
|