diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-15 03:52:37 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-15 03:52:37 -0400 |
| commit | f42a44494bcdf03fc851c03d438464d59c0ceaf5 (patch) | |
| tree | 986ea7b54e9fc79a64863fd7e92eabd99ffd37a3 /net/mac80211/mesh_hwmp.c | |
| parent | 63fe46da9c380b3f2bbdf3765044649517cc717c (diff) | |
| parent | ef85ad541f9a6ccd3f89ec73f92b2d6f45a9d3e8 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/mesh_hwmp.c')
| -rw-r--r-- | net/mac80211/mesh_hwmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c index af0cd1e3e213..7fa149e230e6 100644 --- a/net/mac80211/mesh_hwmp.c +++ b/net/mac80211/mesh_hwmp.c | |||
| @@ -26,7 +26,7 @@ static inline u32 u32_field_get(u8 *preq_elem, int offset, bool ae) | |||
| 26 | { | 26 | { |
| 27 | if (ae) | 27 | if (ae) |
| 28 | offset += 6; | 28 | offset += 6; |
| 29 | return le32_to_cpu(get_unaligned((__le32 *) (preq_elem + offset))); | 29 | return get_unaligned_le32(preq_elem + offset); |
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | /* HWMP IE processing macros */ | 32 | /* HWMP IE processing macros */ |