lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ath9k_htc: Fix sparse endian warnings

Browse Source 
This patch fixes a bunch of endian issues that
were exposed by sparse. It's a miracle that the driver
worked at all till now.

The Lord be praised.

Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Sujith
2010-04-16 11:54:03 +05:30
committed by John W. Linville
parent 6ce34ec11c
commit 7f1f5a0060
9 changed files with 51 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/wireless/ath/ath9k/htc.h
View File

@@ -124,13 +124,13 @@ struct ath9k_htc_cap_target {
struct ath9k_htc_target_vif { struct ath9k_htc_target_vif {
u8 index; u8 index;
u8 des_bssid[ETH_ALEN]; u8 des_bssid[ETH_ALEN];
enum htc_opmode opmode; __be32 opmode;
u8 myaddr[ETH_ALEN]; u8 myaddr[ETH_ALEN];
u8 bssid[ETH_ALEN]; u8 bssid[ETH_ALEN];
u32 flags; u32 flags;
u32 flags_ext; u32 flags_ext;
u16 ps_sta; u16 ps_sta;
u16 rtsthreshold; __be16 rtsthreshold;
u8 ath_cap; u8 ath_cap;
u8 node; u8 node;
s8 mcast_rate; s8 mcast_rate;
@@ -151,7 +151,7 @@ struct ath9k_htc_target_sta {
u8 sta_index; u8 sta_index;
u8 vif_index; u8 vif_index;
u8 vif_sta; u8 vif_sta;
u16 flags; /* ATH_HTC_STA_* */ __be16 flags; /* ATH_HTC_STA_* */
u16 htcap; u16 htcap;
u8 valid; u8 valid;
u16 capinfo; u16 capinfo;
@@ -191,16 +191,16 @@ struct ath9k_htc_rate {
struct ath9k_htc_target_rate { struct ath9k_htc_target_rate {
u8 sta_index; u8 sta_index;
u8 isnew; u8 isnew;
u32 capflags; __be32 capflags;
struct ath9k_htc_rate rates; struct ath9k_htc_rate rates;
}; };
struct ath9k_htc_target_stats { struct ath9k_htc_target_stats {
u32 tx_shortretry; __be32 tx_shortretry;
u32 tx_longretry; __be32 tx_longretry;
u32 tx_xretries; __be32 tx_xretries;
u32 ht_txunaggr_xretry; __be32 ht_txunaggr_xretry;
u32 ht_tx_xretries; __be32 ht_tx_xretries;
} __packed; } __packed;
struct ath9k_htc_vif { struct ath9k_htc_vif {

6
drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
View File

@@ -26,7 +26,8 @@ static void ath9k_htc_beacon_config_sta(struct ath9k_htc_priv *priv,
enum ath9k_int imask = 0; enum ath9k_int imask = 0;
int dtimperiod, dtimcount, sleepduration; int dtimperiod, dtimcount, sleepduration;
int cfpperiod, cfpcount, bmiss_timeout; int cfpperiod, cfpcount, bmiss_timeout;
u32 nexttbtt = 0, intval, tsftu, htc_imask = 0; u32 nexttbtt = 0, intval, tsftu;
__be32 htc_imask = 0;
u64 tsf; u64 tsf;
int num_beacons, offset, dtim_dec_count, cfp_dec_count; int num_beacons, offset, dtim_dec_count, cfp_dec_count;
int ret; int ret;
@@ -142,7 +143,8 @@ static void ath9k_htc_beacon_config_adhoc(struct ath9k_htc_priv *priv,
{ {
struct ath_common *common = ath9k_hw_common(priv->ah); struct ath_common *common = ath9k_hw_common(priv->ah);
enum ath9k_int imask = 0; enum ath9k_int imask = 0;
u32 nexttbtt, intval, htc_imask = 0; u32 nexttbtt, intval;
__be32 htc_imask = 0;
int ret; int ret;
u8 cmd_rsp; u8 cmd_rsp;

14
drivers/net/wireless/ath/ath9k/htc_drv_main.c
View File

@@ -125,7 +125,7 @@ static int ath9k_htc_set_channel(struct ath9k_htc_priv *priv,
bool fastcc = true; bool fastcc = true;
struct ieee80211_channel *channel = hw->conf.channel; struct ieee80211_channel *channel = hw->conf.channel;
enum htc_phymode mode; enum htc_phymode mode;
u16 htc_mode; __be16 htc_mode;
u8 cmd_rsp; u8 cmd_rsp;
int ret; int ret;
@@ -378,7 +378,7 @@ static int ath9k_htc_init_rate(struct ath9k_htc_priv *priv,
priv->tgt_rate.sta_index = ista->index; priv->tgt_rate.sta_index = ista->index;
priv->tgt_rate.isnew = 1; priv->tgt_rate.isnew = 1;
trate = priv->tgt_rate; trate = priv->tgt_rate;
priv->tgt_rate.capflags = caps; priv->tgt_rate.capflags = cpu_to_be32(caps);
trate.capflags = cpu_to_be32(caps); trate.capflags = cpu_to_be32(caps);
WMI_CMD_BUF(WMI_RC_RATE_UPDATE_CMDID, &trate); WMI_CMD_BUF(WMI_RC_RATE_UPDATE_CMDID, &trate);
@@ -426,6 +426,7 @@ static void ath9k_htc_rc_update(struct ath9k_htc_priv *priv, bool is_cw40)
struct ath9k_htc_target_rate trate; struct ath9k_htc_target_rate trate;
struct ath_common *common = ath9k_hw_common(priv->ah); struct ath_common *common = ath9k_hw_common(priv->ah);
int ret; int ret;
u32 caps = be32_to_cpu(priv->tgt_rate.capflags);
u8 cmd_rsp; u8 cmd_rsp;
memset(&trate, 0, sizeof(trate)); memset(&trate, 0, sizeof(trate));
@@ -433,11 +434,12 @@ static void ath9k_htc_rc_update(struct ath9k_htc_priv *priv, bool is_cw40)
trate = priv->tgt_rate; trate = priv->tgt_rate;
if (is_cw40) if (is_cw40)
priv->tgt_rate.capflags |= WLAN_RC_40_FLAG; caps |= WLAN_RC_40_FLAG;
else else
priv->tgt_rate.capflags &= ~WLAN_RC_40_FLAG; caps &= ~WLAN_RC_40_FLAG;
trate.capflags = cpu_to_be32(priv->tgt_rate.capflags); priv->tgt_rate.capflags = cpu_to_be32(caps);
trate.capflags = cpu_to_be32(caps);
WMI_CMD_BUF(WMI_RC_RATE_UPDATE_CMDID, &trate); WMI_CMD_BUF(WMI_RC_RATE_UPDATE_CMDID, &trate);
if (ret) { if (ret) {
@@ -1104,7 +1106,7 @@ static int ath9k_htc_start(struct ieee80211_hw *hw)
struct ath9k_channel *init_channel; struct ath9k_channel *init_channel;
int ret = 0; int ret = 0;
enum htc_phymode mode; enum htc_phymode mode;
u16 htc_mode; __be16 htc_mode;
u8 cmd_rsp; u8 cmd_rsp;
ath_print(common, ATH_DBG_CONFIG, ath_print(common, ATH_DBG_CONFIG,

11
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
View File

@@ -530,7 +530,7 @@ static bool ath9k_rx_prepare(struct ath9k_htc_priv *priv,
priv->ah->stats.avgbrssi = rxbuf->rxstatus.rs_rssi; priv->ah->stats.avgbrssi = rxbuf->rxstatus.rs_rssi;
} }
rx_status->mactime = rxbuf->rxstatus.rs_tstamp; rx_status->mactime = be64_to_cpu(rxbuf->rxstatus.rs_tstamp);
rx_status->band = hw->conf.channel->band; rx_status->band = hw->conf.channel->band;
rx_status->freq = hw->conf.channel->center_freq; rx_status->freq = hw->conf.channel->center_freq;
rx_status->signal = rxbuf->rxstatus.rs_rssi + ATH_DEFAULT_NOISE_FLOOR; rx_status->signal = rxbuf->rxstatus.rs_rssi + ATH_DEFAULT_NOISE_FLOOR;
@@ -634,13 +634,8 @@ void ath9k_htc_rxep(void *drv_priv, struct sk_buff *skb,
rxstatus = (struct ath_htc_rx_status *)skb->data; rxstatus = (struct ath_htc_rx_status *)skb->data;
rxstatus->rs_tstamp = be64_to_cpu(rxstatus->rs_tstamp); if (be16_to_cpu(rxstatus->rs_datalen) -
rxstatus->rs_datalen = be16_to_cpu(rxstatus->rs_datalen); (len - HTC_RX_FRAME_HEADER_SIZE) != 0) {
rxstatus->evm0 = be32_to_cpu(rxstatus->evm0);
rxstatus->evm1 = be32_to_cpu(rxstatus->evm1);
rxstatus->evm2 = be32_to_cpu(rxstatus->evm2);
if (rxstatus->rs_datalen - (len - HTC_RX_FRAME_HEADER_SIZE) != 0) {
ath_print(common, ATH_DBG_FATAL, ath_print(common, ATH_DBG_FATAL,
"Corrupted RX data len, dropping " "Corrupted RX data len, dropping "
"(epid: %d, dlen: %d, skblen: %d)\n", "(epid: %d, dlen: %d, skblen: %d)\n",

8
drivers/net/wireless/ath/ath9k/htc_hst.c
View File

@@ -368,7 +368,7 @@ void ath9k_htc_rx_msg(struct htc_target *htc_handle,
struct htc_frame_hdr *htc_hdr; struct htc_frame_hdr *htc_hdr;
enum htc_endpoint_id epid; enum htc_endpoint_id epid;
struct htc_endpoint *endpoint; struct htc_endpoint *endpoint;
u16 *msg_id; __be16 *msg_id;
if (!htc_handle || !skb) if (!htc_handle || !skb)
return; return;
@@ -388,14 +388,14 @@ void ath9k_htc_rx_msg(struct htc_target *htc_handle,
/* Handle trailer */ /* Handle trailer */
if (htc_hdr->flags & HTC_FLAGS_RECV_TRAILER) { if (htc_hdr->flags & HTC_FLAGS_RECV_TRAILER) {
if (be32_to_cpu(*(u32 *) skb->data) == 0x00C60000) if (be32_to_cpu(*(__be32 *) skb->data) == 0x00C60000)
/* Move past the Watchdog pattern */ /* Move past the Watchdog pattern */
htc_hdr = (struct htc_frame_hdr *)(skb->data + 4); htc_hdr = (struct htc_frame_hdr *)(skb->data + 4);
} }
/* Get the message ID */ /* Get the message ID */
msg_id = (u16 *) ((void *) htc_hdr + msg_id = (__be16 *) ((void *) htc_hdr +
sizeof(struct htc_frame_hdr)); sizeof(struct htc_frame_hdr));
/* Now process HTC messages */ /* Now process HTC messages */
switch (be16_to_cpu(*msg_id)) { switch (be16_to_cpu(*msg_id)) {

24
drivers/net/wireless/ath/ath9k/htc_hst.h
View File

@@ -59,20 +59,20 @@ enum htc_endpoint_id {
struct htc_frame_hdr { struct htc_frame_hdr {
u8 endpoint_id; u8 endpoint_id;
u8 flags; u8 flags;
u16 payload_len; __be16 payload_len;
u8 control[4]; u8 control[4];
} __packed; } __packed;
struct htc_ready_msg { struct htc_ready_msg {
u16 message_id; __be16 message_id;
u16 credits; __be16 credits;
u16 credit_size; __be16 credit_size;
u8 max_endpoints; u8 max_endpoints;
u8 pad; u8 pad;
} __packed; } __packed;
struct htc_config_pipe_msg { struct htc_config_pipe_msg {
u16 message_id; __be16 message_id;
u8 pipe_id; u8 pipe_id;
u8 credits; u8 credits;
} __packed; } __packed;
@@ -192,9 +192,9 @@ enum htc_service_group_ids{
#define WMI_DATA_BK_SVC MAKE_SERVICE_ID(WMI_SERVICE_GROUP, 8) #define WMI_DATA_BK_SVC MAKE_SERVICE_ID(WMI_SERVICE_GROUP, 8)
struct htc_conn_svc_msg { struct htc_conn_svc_msg {
u16 msg_id; __be16 msg_id;
u16 service_id; __be16 service_id;
u16 con_flags; __be16 con_flags;
u8 dl_pipeid; u8 dl_pipeid;
u8 ul_pipeid; u8 ul_pipeid;
u8 svc_meta_len; u8 svc_meta_len;
@@ -209,17 +209,17 @@ struct htc_conn_svc_msg {
#define HTC_SERVICE_NO_MORE_EP 4 #define HTC_SERVICE_NO_MORE_EP 4
struct htc_conn_svc_rspmsg { struct htc_conn_svc_rspmsg {
u16 msg_id; __be16 msg_id;
u16 service_id; __be16 service_id;
u8 status; u8 status;
u8 endpoint_id; u8 endpoint_id;
u16 max_msg_len; __be16 max_msg_len;
u8 svc_meta_len; u8 svc_meta_len;
u8 pad; u8 pad;
} __packed; } __packed;
struct htc_comp_msg { struct htc_comp_msg {
u16 msg_id; __be16 msg_id;
} __packed; } __packed;
int htc_init(struct htc_target *target); int htc_init(struct htc_target *target);

10
drivers/net/wireless/ath/ath9k/mac.h
View File

@@ -155,8 +155,8 @@ struct ath_rx_status {
}; };
struct ath_htc_rx_status { struct ath_htc_rx_status {
u64 rs_tstamp; __be64 rs_tstamp;
u16 rs_datalen; __be16 rs_datalen;
u8 rs_status; u8 rs_status;
u8 rs_phyerr; u8 rs_phyerr;
int8_t rs_rssi; int8_t rs_rssi;
@@ -175,9 +175,9 @@ struct ath_htc_rx_status {
u8 rs_num_delims; u8 rs_num_delims;
u8 rs_flags; u8 rs_flags;
u8 rs_dummy; u8 rs_dummy;
u32 evm0; __be32 evm0;
u32 evm1; __be32 evm1;
u32 evm2; __be32 evm2;
}; };
#define ATH9K_RXERR_CRC 0x01 #define ATH9K_RXERR_CRC 0x01

2
drivers/net/wireless/ath/ath9k/wmi.c
View File

@@ -129,7 +129,7 @@ void ath9k_wmi_tasklet(unsigned long data)
void *wmi_event; void *wmi_event;
unsigned long flags; unsigned long flags;
#ifdef CONFIG_ATH9K_HTC_DEBUGFS #ifdef CONFIG_ATH9K_HTC_DEBUGFS
u32 txrate; __be32 txrate;
#endif #endif
spin_lock_irqsave(&priv->wmi->wmi_lock, flags); spin_lock_irqsave(&priv->wmi->wmi_lock, flags);

10
drivers/net/wireless/ath/ath9k/wmi.h
View File

@@ -19,7 +19,7 @@
struct wmi_event_txrate { struct wmi_event_txrate {
u32 txrate; __be32 txrate;
struct { struct {
u8 rssi_thresh; u8 rssi_thresh;
u8 per; u8 per;
@@ -27,8 +27,8 @@ struct wmi_event_txrate {
} __packed; } __packed;
struct wmi_cmd_hdr { struct wmi_cmd_hdr {
u16 command_id; __be16 command_id;
u16 seq_no; __be16 seq_no;
} __packed; } __packed;
struct wmi_swba { struct wmi_swba {
@@ -87,8 +87,8 @@ enum wmi_event_id {
#define MAX_CMD_NUMBER 62 #define MAX_CMD_NUMBER 62
struct register_write { struct register_write {
u32 reg; __be32 reg;
u32 val; __be32 val;
}; };
struct wmi { struct wmi {