diff options
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi')
-rw-r--r-- | drivers/net/wireless/iwmc3200wifi/Makefile | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwmc3200wifi/rx.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/iwmc3200wifi/trace.h | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwmc3200wifi/tx.c | 4 |
4 files changed, 8 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/Makefile b/drivers/net/wireless/iwmc3200wifi/Makefile index aeed5cd80819..cdc7e07ba113 100644 --- a/drivers/net/wireless/iwmc3200wifi/Makefile +++ b/drivers/net/wireless/iwmc3200wifi/Makefile | |||
@@ -6,3 +6,5 @@ iwmc3200wifi-$(CONFIG_IWM_DEBUG) += debugfs.o | |||
6 | iwmc3200wifi-$(CONFIG_IWM_TRACING) += trace.o | 6 | iwmc3200wifi-$(CONFIG_IWM_TRACING) += trace.o |
7 | 7 | ||
8 | CFLAGS_trace.o := -I$(src) | 8 | CFLAGS_trace.o := -I$(src) |
9 | |||
10 | ccflags-y += -D__CHECK_ENDIAN__ | ||
diff --git a/drivers/net/wireless/iwmc3200wifi/rx.c b/drivers/net/wireless/iwmc3200wifi/rx.c index ad5398779240..e1184deca559 100644 --- a/drivers/net/wireless/iwmc3200wifi/rx.c +++ b/drivers/net/wireless/iwmc3200wifi/rx.c | |||
@@ -431,7 +431,8 @@ static int iwm_ntf_rx_ticket(struct iwm_priv *iwm, u8 *buf, | |||
431 | return PTR_ERR(ticket_node); | 431 | return PTR_ERR(ticket_node); |
432 | 432 | ||
433 | IWM_DBG_RX(iwm, DBG, "TICKET %s(%d)\n", | 433 | IWM_DBG_RX(iwm, DBG, "TICKET %s(%d)\n", |
434 | ticket->action == IWM_RX_TICKET_RELEASE ? | 434 | __le16_to_cpu(ticket->action) == |
435 | IWM_RX_TICKET_RELEASE ? | ||
435 | "RELEASE" : "DROP", | 436 | "RELEASE" : "DROP", |
436 | ticket->id); | 437 | ticket->id); |
437 | spin_lock(&iwm->ticket_lock); | 438 | spin_lock(&iwm->ticket_lock); |
diff --git a/drivers/net/wireless/iwmc3200wifi/trace.h b/drivers/net/wireless/iwmc3200wifi/trace.h index 320e54fbb38c..abb4805fa8df 100644 --- a/drivers/net/wireless/iwmc3200wifi/trace.h +++ b/drivers/net/wireless/iwmc3200wifi/trace.h | |||
@@ -76,7 +76,7 @@ TRACE_EVENT(iwm_tx_wifi_cmd, | |||
76 | IWM_ASSIGN; | 76 | IWM_ASSIGN; |
77 | __entry->opcode = hdr->sw_hdr.cmd.cmd; | 77 | __entry->opcode = hdr->sw_hdr.cmd.cmd; |
78 | __entry->lmac = 0; | 78 | __entry->lmac = 0; |
79 | __entry->seq = hdr->sw_hdr.cmd.seq_num; | 79 | __entry->seq = __le16_to_cpu(hdr->sw_hdr.cmd.seq_num); |
80 | __entry->resp = GET_VAL8(hdr->sw_hdr.cmd.flags, UMAC_DEV_CMD_FLAGS_RESP_REQ); | 80 | __entry->resp = GET_VAL8(hdr->sw_hdr.cmd.flags, UMAC_DEV_CMD_FLAGS_RESP_REQ); |
81 | __entry->color = GET_VAL32(hdr->sw_hdr.meta_data, UMAC_FW_CMD_TX_STA_COLOR); | 81 | __entry->color = GET_VAL32(hdr->sw_hdr.meta_data, UMAC_FW_CMD_TX_STA_COLOR); |
82 | __entry->eot = GET_VAL32(hdr->hw_hdr.cmd, UMAC_HDI_OUT_CMD_EOT); | 82 | __entry->eot = GET_VAL32(hdr->hw_hdr.cmd, UMAC_HDI_OUT_CMD_EOT); |
@@ -123,7 +123,7 @@ TRACE_EVENT(iwm_tx_packets, | |||
123 | __entry->ra_tid = GET_VAL32(hdr->hw_hdr.meta_data, UMAC_HDI_OUT_RATID); | 123 | __entry->ra_tid = GET_VAL32(hdr->hw_hdr.meta_data, UMAC_HDI_OUT_RATID); |
124 | __entry->credit_group = GET_VAL32(hdr->hw_hdr.meta_data, UMAC_HDI_OUT_CREDIT_GRP); | 124 | __entry->credit_group = GET_VAL32(hdr->hw_hdr.meta_data, UMAC_HDI_OUT_CREDIT_GRP); |
125 | __entry->color = GET_VAL32(hdr->sw_hdr.meta_data, UMAC_FW_CMD_TX_STA_COLOR); | 125 | __entry->color = GET_VAL32(hdr->sw_hdr.meta_data, UMAC_FW_CMD_TX_STA_COLOR); |
126 | __entry->seq = hdr->sw_hdr.cmd.seq_num; | 126 | __entry->seq = __le16_to_cpu(hdr->sw_hdr.cmd.seq_num); |
127 | __entry->npkt = 1; | 127 | __entry->npkt = 1; |
128 | __entry->bytes = len; | 128 | __entry->bytes = len; |
129 | 129 | ||
diff --git a/drivers/net/wireless/iwmc3200wifi/tx.c b/drivers/net/wireless/iwmc3200wifi/tx.c index 9537cdb13d3f..3216621fc55a 100644 --- a/drivers/net/wireless/iwmc3200wifi/tx.c +++ b/drivers/net/wireless/iwmc3200wifi/tx.c | |||
@@ -302,8 +302,8 @@ void iwm_tx_credit_init_pools(struct iwm_priv *iwm, | |||
302 | 302 | ||
303 | #define IWM_UDMA_HDR_LEN sizeof(struct iwm_umac_wifi_out_hdr) | 303 | #define IWM_UDMA_HDR_LEN sizeof(struct iwm_umac_wifi_out_hdr) |
304 | 304 | ||
305 | static int iwm_tx_build_packet(struct iwm_priv *iwm, struct sk_buff *skb, | 305 | static __le16 iwm_tx_build_packet(struct iwm_priv *iwm, struct sk_buff *skb, |
306 | int pool_id, u8 *buf) | 306 | int pool_id, u8 *buf) |
307 | { | 307 | { |
308 | struct iwm_umac_wifi_out_hdr *hdr = (struct iwm_umac_wifi_out_hdr *)buf; | 308 | struct iwm_umac_wifi_out_hdr *hdr = (struct iwm_umac_wifi_out_hdr *)buf; |
309 | struct iwm_udma_wifi_cmd udma_cmd; | 309 | struct iwm_udma_wifi_cmd udma_cmd; |