Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

This commit is contained in:
David S. Miller
2008-05-15 00:52:37 -07:00
71 changed files with 2544 additions and 2141 deletions

View File

@@ -26,7 +26,7 @@ static inline u32 u32_field_get(u8 *preq_elem, int offset, bool ae)
{
if (ae)
offset += 6;
return le32_to_cpu(get_unaligned((__le32 *) (preq_elem + offset)));
return get_unaligned_le32(preq_elem + offset);
}
/* HWMP IE processing macros */