Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 33690
b: refs/heads/master
c: ee1377c
h: refs/heads/master
v: v3
  • Loading branch information
Stephen Hemminger authored and David S. Miller committed Aug 30, 2006
1 parent 5c4b847 commit 798a75f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 57f5f544f58ffa1d6c38630d0522c9c0be67c533
refs/heads/master: ee1377c3eef4238d89b2f99fa4d0bbbad3078b64
6 changes: 4 additions & 2 deletions trunk/drivers/net/wireless/strip.c
Original file line number Diff line number Diff line change
Expand Up @@ -467,17 +467,19 @@ 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);

if (neighbor_entry != NULL) {
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,
Expand Down

0 comments on commit 798a75f

Please sign in to comment.