diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-04 12:29:54 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-04 12:29:54 +0200 |
| commit | 3784fd7316d336f2ba79b6c7c8168d08eff8a714 (patch) | |
| tree | 3019c37f1ba588f252d1a9f1ef33beb5d3d683b1 /drivers/net/wireless | |
| parent | Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 ... (diff) | |
| parent | Linux 2.6.18-rc6 (diff) | |
| download | linux-3784fd7316d336f2ba79b6c7c8168d08eff8a714.tar.xz linux-3784fd7316d336f2ba79b6c7c8168d08eff8a714.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/strip.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c index fd31885c6844..ccaf28e8db0a 100644 --- a/drivers/net/wireless/strip.c +++ b/drivers/net/wireless/strip.c @@ -467,6 +467,7 @@ static int arp_query(unsigned char *haddr, u32 paddr, struct net_device *dev) { struct neighbour *neighbor_entry; + int ret = 0; neighbor_entry = neigh_lookup(&arp_tbl, &paddr, dev); @@ -474,10 +475,11 @@ static int arp_query(unsigned char *haddr, u32 paddr, neighbor_entry->used = jiffies; if (neighbor_entry->nud_state & NUD_VALID) { memcpy(haddr, neighbor_entry->ha, dev->addr_len); - return 1; + ret = 1; } + neigh_release(neighbor_entry); } - return 0; + return ret; } static void DumpData(char *msg, struct strip *strip_info, __u8 * ptr, |