Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 2 insertions, 6 deletions

diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c
index e18305b781c9..4e5c8fc35200 100644
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
@@ -58,10 +58,6 @@
 #include "reg.h"
 #include "debug.h"
 
-/* unaligned little endian access */
-#define LE_READ_2(_p) (le16_to_cpu(get_unaligned((__le16 *)(_p))))
-#define LE_READ_4(_p) (le32_to_cpu(get_unaligned((__le32 *)(_p))))
-
 enum {
         ATH_LED_TX,
         ATH_LED_RX,
@@ -2909,9 +2905,9 @@ static void ath5k_configure_filter(struct ieee80211_hw *hw,
                         if (!mclist)
                                 break;
                         /* calculate XOR of eight 6-bit values */
-                        val = LE_READ_4(mclist->dmi_addr + 0);
+                        val = get_unaligned_le32(mclist->dmi_addr + 0);
                         pos = (val >> 18) ^ (val >> 12) ^ (val >> 6) ^ val;
-                        val = LE_READ_4(mclist->dmi_addr + 3);
+                        val = get_unaligned_le32(mclist->dmi_addr + 3);
                         pos ^= (val >> 18) ^ (val >> 12) ^ (val >> 6) ^ val;
                         pos &= 0x3f;
                         mfilt[pos / 32] |= (1 << (pos % 32));