diff options
author | David S. Miller <davem@davemloft.net> | 2009-08-03 19:05:50 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-08-03 19:05:50 -0700 |
commit | eca4c3d2dd66d0230140c9af05dee591df6f0e42 (patch) | |
tree | 59167ea2ac39a78f626bb3905e495963af326b77 /drivers/net/wireless/zd1211rw/zd_mac.c | |
parent | f6caa14aa0b126d4a2933907d1519611b2a8524a (diff) | |
parent | 99f1b01562b7dcae75b043114f76163fbf84fcab (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/zd1211rw/zd_mac.c')
-rw-r--r-- | drivers/net/wireless/zd1211rw/zd_mac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c index 40b07b988224..3bd3c779fff3 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c @@ -698,7 +698,7 @@ int zd_mac_rx(struct ieee80211_hw *hw, const u8 *buffer, unsigned int length) && !mac->pass_ctrl) return 0; - fc = *(__le16 *)buffer; + fc = get_unaligned((__le16*)buffer); need_padding = ieee80211_is_data_qos(fc) ^ ieee80211_has_a4(fc); skb = dev_alloc_skb(length + (need_padding ? 2 : 0)); |