projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[powerpc.git]
/
drivers
/
net
/
wireless
/
zd1211rw
/
zd_ieee80211.h
diff --git
a/drivers/net/wireless/zd1211rw/zd_ieee80211.h
b/drivers/net/wireless/zd1211rw/zd_ieee80211.h
index
f63245b
..
c4f36d3
100644
(file)
--- a/
drivers/net/wireless/zd1211rw/zd_ieee80211.h
+++ b/
drivers/net/wireless/zd1211rw/zd_ieee80211.h
@@
-2,7
+2,6
@@
#define _ZD_IEEE80211_H
#include <net/ieee80211.h>
#define _ZD_IEEE80211_H
#include <net/ieee80211.h>
-#include "zd_types.h"
/* Additional definitions from the standards.
*/
/* Additional definitions from the standards.
*/
@@
-50,6
+49,7
@@
static inline u8 zd_ofdm_plcp_header_rate(
return header->prefix[0] & 0xf;
}
return header->prefix[0] & 0xf;
}
+/* These are referred to as zd_rates */
#define ZD_OFDM_RATE_6M 0xb
#define ZD_OFDM_RATE_9M 0xf
#define ZD_OFDM_RATE_12M 0xa
#define ZD_OFDM_RATE_6M 0xb
#define ZD_OFDM_RATE_9M 0xf
#define ZD_OFDM_RATE_12M 0xa
@@
-64,7
+64,7
@@
struct cck_plcp_header {
u8 service;
__le16 length;
__le16 crc16;
u8 service;
__le16 length;
__le16 crc16;
-};
+}
__attribute__((packed))
;
static inline u8 zd_cck_plcp_header_rate(const struct cck_plcp_header *header)
{
static inline u8 zd_cck_plcp_header_rate(const struct cck_plcp_header *header)
{