diff options
author | John W. Linville <linville@tuxdriver.com> | 2011-03-04 14:10:40 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-03-04 14:10:40 -0500 |
commit | 85a7045a90052749885e166f40af5e9140032287 (patch) | |
tree | cb4702d50bbe1d10ab9320ad3f63323b817727f7 /drivers/net/wireless/wl12xx/rx.h | |
parent | 29546a6404e3a4b5d13f0a9586eb5cf1c3b25167 (diff) | |
parent | e46395a4b3d32d161d8b6d8e4a002972b1faae3e (diff) | |
download | lwn-85a7045a90052749885e166f40af5e9140032287.tar.gz lwn-85a7045a90052749885e166f40af5e9140032287.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/wl12xx/rx.h')
-rw-r--r-- | drivers/net/wireless/wl12xx/rx.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wireless/wl12xx/rx.h b/drivers/net/wireless/wl12xx/rx.h index 4cef8fa3dee1..75fabf836491 100644 --- a/drivers/net/wireless/wl12xx/rx.h +++ b/drivers/net/wireless/wl12xx/rx.h @@ -30,10 +30,6 @@ #define WL1271_RX_MAX_RSSI -30 #define WL1271_RX_MIN_RSSI -95 -#define WL1271_RX_ALIGN_TO 4 -#define WL1271_RX_ALIGN(len) (((len) + WL1271_RX_ALIGN_TO - 1) & \ - ~(WL1271_RX_ALIGN_TO - 1)) - #define SHORT_PREAMBLE_BIT BIT(0) #define OFDM_RATE_BIT BIT(6) #define PBCC_RATE_BIT BIT(7) |