d0f63b2021
We were not handling endianess correctly. The wl1271 chip runs on little-endian values. This patch makes sure that all the communication with the wl1271 firmware is done in little-endian by using cpu_to_le* and le*_to_cpu where appropriate. Also, all the struct definitions for data exchanged with the firmware has been changed to use __le16/32 types instead of u16/32. This fixes a few sparse warnings, such as these: drivers/net/wireless/wl12xx/wl1271_cmd.c:554:42: warning: incorrect type in assignment (different base types) drivers/net/wireless/wl12xx/wl1271_cmd.c:555:42: warning: incorrect type in assignment (different base types) drivers/net/wireless/wl12xx/wl1271_cmd.c:577:58: warning: incorrect type in assignment (different base types) drivers/net/wireless/wl12xx/wl1271_cmd.c:579:58: warning: incorrect type in assignment (different base types) drivers/net/wireless/wl12xx/wl1271_cmd.c:676:18: warning: incorrect type in assignment (different base types) drivers/net/wireless/wl12xx/wl1271_cmd.c:787:22: warning: incorrect type in assignment (different base types) drivers/net/wireless/wl12xx/wl1271_cmd.c:789:21: warning: incorrect type in assignment (different base types) drivers/net/wireless/wl12xx/wl1271_tx.c:98:47: warning: incorrect type in argument 1 (different base types) drivers/net/wireless/wl12xx/wl1271_acx.c:932:32: warning: incorrect type in assignment (different base types) drivers/net/wireless/wl12xx/wl1271_boot.c:191:32: warning: incorrect type in argument 1 (different base types) drivers/net/wireless/wl12xx/wl1271_boot.c:197:38: warning: incorrect type in argument 1 (different base types) drivers/net/wireless/wl12xx/wl1271_boot.c:199:37: warning: incorrect type in argument 1 (different base types) drivers/net/wireless/wl12xx/wl1271_init.c:255:40: warning: incorrect type in assignment (different base types) drivers/net/wireless/wl12xx/wl1271_init.c:275:53: warning: incorrect type in assignment (different base types) Reported-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com> Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
156 lines
4.2 KiB
C
156 lines
4.2 KiB
C
#ifndef __WL12XX_80211_H__
|
|
#define __WL12XX_80211_H__
|
|
|
|
#include <linux/if_ether.h> /* ETH_ALEN */
|
|
|
|
/* RATES */
|
|
#define IEEE80211_CCK_RATE_1MB 0x02
|
|
#define IEEE80211_CCK_RATE_2MB 0x04
|
|
#define IEEE80211_CCK_RATE_5MB 0x0B
|
|
#define IEEE80211_CCK_RATE_11MB 0x16
|
|
#define IEEE80211_OFDM_RATE_6MB 0x0C
|
|
#define IEEE80211_OFDM_RATE_9MB 0x12
|
|
#define IEEE80211_OFDM_RATE_12MB 0x18
|
|
#define IEEE80211_OFDM_RATE_18MB 0x24
|
|
#define IEEE80211_OFDM_RATE_24MB 0x30
|
|
#define IEEE80211_OFDM_RATE_36MB 0x48
|
|
#define IEEE80211_OFDM_RATE_48MB 0x60
|
|
#define IEEE80211_OFDM_RATE_54MB 0x6C
|
|
#define IEEE80211_BASIC_RATE_MASK 0x80
|
|
|
|
#define IEEE80211_CCK_RATE_1MB_MASK (1<<0)
|
|
#define IEEE80211_CCK_RATE_2MB_MASK (1<<1)
|
|
#define IEEE80211_CCK_RATE_5MB_MASK (1<<2)
|
|
#define IEEE80211_CCK_RATE_11MB_MASK (1<<3)
|
|
#define IEEE80211_OFDM_RATE_6MB_MASK (1<<4)
|
|
#define IEEE80211_OFDM_RATE_9MB_MASK (1<<5)
|
|
#define IEEE80211_OFDM_RATE_12MB_MASK (1<<6)
|
|
#define IEEE80211_OFDM_RATE_18MB_MASK (1<<7)
|
|
#define IEEE80211_OFDM_RATE_24MB_MASK (1<<8)
|
|
#define IEEE80211_OFDM_RATE_36MB_MASK (1<<9)
|
|
#define IEEE80211_OFDM_RATE_48MB_MASK (1<<10)
|
|
#define IEEE80211_OFDM_RATE_54MB_MASK (1<<11)
|
|
|
|
#define IEEE80211_CCK_RATES_MASK 0x0000000F
|
|
#define IEEE80211_CCK_BASIC_RATES_MASK (IEEE80211_CCK_RATE_1MB_MASK | \
|
|
IEEE80211_CCK_RATE_2MB_MASK)
|
|
#define IEEE80211_CCK_DEFAULT_RATES_MASK (IEEE80211_CCK_BASIC_RATES_MASK | \
|
|
IEEE80211_CCK_RATE_5MB_MASK | \
|
|
IEEE80211_CCK_RATE_11MB_MASK)
|
|
|
|
#define IEEE80211_OFDM_RATES_MASK 0x00000FF0
|
|
#define IEEE80211_OFDM_BASIC_RATES_MASK (IEEE80211_OFDM_RATE_6MB_MASK | \
|
|
IEEE80211_OFDM_RATE_12MB_MASK | \
|
|
IEEE80211_OFDM_RATE_24MB_MASK)
|
|
#define IEEE80211_OFDM_DEFAULT_RATES_MASK (IEEE80211_OFDM_BASIC_RATES_MASK | \
|
|
IEEE80211_OFDM_RATE_9MB_MASK | \
|
|
IEEE80211_OFDM_RATE_18MB_MASK | \
|
|
IEEE80211_OFDM_RATE_36MB_MASK | \
|
|
IEEE80211_OFDM_RATE_48MB_MASK | \
|
|
IEEE80211_OFDM_RATE_54MB_MASK)
|
|
#define IEEE80211_DEFAULT_RATES_MASK (IEEE80211_OFDM_DEFAULT_RATES_MASK | \
|
|
IEEE80211_CCK_DEFAULT_RATES_MASK)
|
|
|
|
|
|
/* This really should be 8, but not for our firmware */
|
|
#define MAX_SUPPORTED_RATES 32
|
|
#define COUNTRY_STRING_LEN 3
|
|
#define MAX_COUNTRY_TRIPLETS 32
|
|
|
|
/* Headers */
|
|
struct ieee80211_header {
|
|
__le16 frame_ctl;
|
|
__le16 duration_id;
|
|
u8 da[ETH_ALEN];
|
|
u8 sa[ETH_ALEN];
|
|
u8 bssid[ETH_ALEN];
|
|
__le16 seq_ctl;
|
|
u8 payload[0];
|
|
} __attribute__ ((packed));
|
|
|
|
struct wl12xx_ie_header {
|
|
u8 id;
|
|
u8 len;
|
|
} __attribute__ ((packed));
|
|
|
|
/* IEs */
|
|
|
|
struct wl12xx_ie_ssid {
|
|
struct wl12xx_ie_header header;
|
|
char ssid[IW_ESSID_MAX_SIZE];
|
|
} __attribute__ ((packed));
|
|
|
|
struct wl12xx_ie_rates {
|
|
struct wl12xx_ie_header header;
|
|
u8 rates[MAX_SUPPORTED_RATES];
|
|
} __attribute__ ((packed));
|
|
|
|
struct wl12xx_ie_ds_params {
|
|
struct wl12xx_ie_header header;
|
|
u8 channel;
|
|
} __attribute__ ((packed));
|
|
|
|
struct country_triplet {
|
|
u8 channel;
|
|
u8 num_channels;
|
|
u8 max_tx_power;
|
|
} __attribute__ ((packed));
|
|
|
|
struct wl12xx_ie_country {
|
|
struct wl12xx_ie_header header;
|
|
u8 country_string[COUNTRY_STRING_LEN];
|
|
struct country_triplet triplets[MAX_COUNTRY_TRIPLETS];
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
/* Templates */
|
|
|
|
struct wl12xx_beacon_template {
|
|
struct ieee80211_header header;
|
|
__le32 time_stamp[2];
|
|
__le16 beacon_interval;
|
|
__le16 capability;
|
|
struct wl12xx_ie_ssid ssid;
|
|
struct wl12xx_ie_rates rates;
|
|
struct wl12xx_ie_rates ext_rates;
|
|
struct wl12xx_ie_ds_params ds_params;
|
|
struct wl12xx_ie_country country;
|
|
} __attribute__ ((packed));
|
|
|
|
struct wl12xx_null_data_template {
|
|
struct ieee80211_header header;
|
|
} __attribute__ ((packed));
|
|
|
|
struct wl12xx_ps_poll_template {
|
|
__le16 fc;
|
|
__le16 aid;
|
|
u8 bssid[ETH_ALEN];
|
|
u8 ta[ETH_ALEN];
|
|
} __attribute__ ((packed));
|
|
|
|
struct wl12xx_qos_null_data_template {
|
|
struct ieee80211_header header;
|
|
__le16 qos_ctl;
|
|
} __attribute__ ((packed));
|
|
|
|
struct wl12xx_probe_req_template {
|
|
struct ieee80211_header header;
|
|
struct wl12xx_ie_ssid ssid;
|
|
struct wl12xx_ie_rates rates;
|
|
struct wl12xx_ie_rates ext_rates;
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
struct wl12xx_probe_resp_template {
|
|
struct ieee80211_header header;
|
|
__le32 time_stamp[2];
|
|
__le16 beacon_interval;
|
|
__le16 capability;
|
|
struct wl12xx_ie_ssid ssid;
|
|
struct wl12xx_ie_rates rates;
|
|
struct wl12xx_ie_rates ext_rates;
|
|
struct wl12xx_ie_ds_params ds_params;
|
|
struct wl12xx_ie_country country;
|
|
} __attribute__ ((packed));
|
|
|
|
#endif
|