lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'from-linus' into upstream

Browse Source
This commit is contained in:
John W. Linville
2006-09-11 14:08:41 -04:00
parent c576af4791 38f5745c5a
commit 623b3e1d64
204 changed files with 4071 additions and 1915 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/strip.c
View File

@@ -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,