git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into gfs2
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
zd1211rw
/
zd_mac.h
diff --git
a/drivers/net/wireless/zd1211rw/zd_mac.h
b/drivers/net/wireless/zd1211rw/zd_mac.h
index
2b596cc
..
b8ea3de
100644
(file)
--- a/
drivers/net/wireless/zd1211rw/zd_mac.h
+++ b/
drivers/net/wireless/zd1211rw/zd_mac.h
@@
-82,7
+82,7
@@
struct zd_ctrlset {
struct rx_length_info {
__le16 length[3];
__le16 tag;
struct rx_length_info {
__le16 length[3];
__le16 tag;
-}
__attribute__((packed))
;
+};
#define RX_LENGTH_INFO_TAG 0x697e
#define RX_LENGTH_INFO_TAG 0x697e
@@
-93,7
+93,7
@@
struct rx_status {
u8 signal_quality_ofdm;
u8 decryption_type;
u8 frame_status;
u8 signal_quality_ofdm;
u8 decryption_type;
u8 frame_status;
-}
__attribute__((packed))
;
+};
/* rx_status field decryption_type */
#define ZD_RX_NO_WEP 0
/* rx_status field decryption_type */
#define ZD_RX_NO_WEP 0
@@
-120,6
+120,10
@@
enum mac_flags {
MAC_FIXED_CHANNEL = 0x01,
};
MAC_FIXED_CHANNEL = 0x01,
};
+struct housekeeping {
+ struct work_struct link_led_work;
+};
+
#define ZD_MAC_STATS_BUFFER_SIZE 16
struct zd_mac {
#define ZD_MAC_STATS_BUFFER_SIZE 16
struct zd_mac {
@@
-128,6
+132,7
@@
struct zd_mac {
struct net_device *netdev;
/* Unlocked reading possible */
struct iw_statistics iw_stats;
struct net_device *netdev;
/* Unlocked reading possible */
struct iw_statistics iw_stats;
+ struct housekeeping housekeeping;
unsigned int stats_count;
u8 qual_buffer[ZD_MAC_STATS_BUFFER_SIZE];
u8 rssi_buffer[ZD_MAC_STATS_BUFFER_SIZE];
unsigned int stats_count;
u8 qual_buffer[ZD_MAC_STATS_BUFFER_SIZE];
u8 rssi_buffer[ZD_MAC_STATS_BUFFER_SIZE];