diff options
| author | Juuso Oikarinen | 2010-02-22 07:38:40 +0100 |
|---|---|---|
| committer | John W. Linville | 2010-03-09 21:03:04 +0100 |
| commit | 04e36fc5f1ff4e349ea21de8d15e4e1844d04197 (patch) | |
| tree | 8778ddf51094e3339392ea68233ce02c526ad418 /drivers/net/wireless/wl12xx/wl1271.h | |
| parent | wl1271: Clean up firmware block allocation calculation (diff) | |
| download | kernel-qcow2-linux-04e36fc5f1ff4e349ea21de8d15e4e1844d04197.tar.gz kernel-qcow2-linux-04e36fc5f1ff4e349ea21de8d15e4e1844d04197.tar.xz kernel-qcow2-linux-04e36fc5f1ff4e349ea21de8d15e4e1844d04197.zip | |
wl1271: Clean up TX security sequence number handling
Instead of managing the TX security sequence number as two variables, use
one 64 bit variable. This greatly simplifies the handling of the number.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Teemu Paasikivi <ext-teemu.3.paasikivi@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271.h')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271.h b/drivers/net/wireless/wl12xx/wl1271.h index 41de47caa201..0deb4fdf916b 100644 --- a/drivers/net/wireless/wl12xx/wl1271.h +++ b/drivers/net/wireless/wl12xx/wl1271.h @@ -110,6 +110,9 @@ enum { #define WL1271_FW_NAME "wl1271-fw.bin" #define WL1271_NVS_NAME "wl1271-nvs.bin" +#define WL1271_TX_SECURITY_LO16(s) ((u16)((s) & 0xffff)) +#define WL1271_TX_SECURITY_HI32(s) ((u32)(((s) >> 16) & 0xffffffff)) + /* NVS data structure */ #define WL1271_NVS_SECTION_SIZE 468 @@ -419,8 +422,7 @@ struct wl1271 { /* Security sequence number counters */ u8 tx_security_last_seq; - u16 tx_security_seq_16; - u32 tx_security_seq_32; + s64 tx_security_seq; /* FW Rx counter */ u32 rx_counter; |