From: Tomas Winkler <tomas.winkler@xxxxxxxxx>
This patch fixes endianity issue for frame control field
in iwl_hw_build_tx_cmd_rate function. In addition it converts
frame_ctl to fc to align name convention in driver.
Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Signed-off-by: Zhu Yi <yi.zhu@xxxxxxxxx>
---
drivers/net/wireless/iwl-4965.c | 9 ++++-----
drivers/net/wireless/iwl-base.c | 28 ++++++++++++++--------------
2 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/drivers/net/wireless/iwl-4965.c b/drivers/net/wireless/iwl-4965.c
index 631bd19..eca9eed 100644
--- a/drivers/net/wireless/iwl-4965.c
+++ b/drivers/net/wireless/iwl-4965.c
@@ -2637,6 +2637,7 @@ void iwl_hw_build_tx_cmd_rate(struct iwl_priv *priv,
u8 rts_retry_limit = 0;
u8 data_retry_limit = 0;
__le32 tx_flags;
+ u16 fc = le16_to_cpu(hdr->frame_control);
tx_flags = cmd->cmd.tx.tx_flags;
@@ -2645,7 +2646,7 @@ void iwl_hw_build_tx_cmd_rate(struct iwl_priv *priv,
rts_retry_limit = (is_hcca) ?
RTS_HCCA_RETRY_LIMIT : RTS_DFAULT_RETRY_LIMIT;
- if (ieee80211_is_probe_response(hdr->frame_control)) {
+ if (ieee80211_is_probe_response(fc)) {
data_retry_limit = 3;
if (data_retry_limit < rts_retry_limit)
rts_retry_limit = data_retry_limit;
@@ -2655,10 +2656,8 @@ void iwl_hw_build_tx_cmd_rate(struct iwl_priv *priv,
if (priv->data_retry_limit != -1)
data_retry_limit = priv->data_retry_limit;
- if ((le16_to_cpu(hdr->frame_control) & IEEE80211_FCTL_FTYPE)
- == IEEE80211_FTYPE_MGMT) {
- switch (le16_to_cpu(hdr->frame_control) &
- IEEE80211_FCTL_STYPE) {
+ if ((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT) {
+ switch (fc & IEEE80211_FCTL_STYPE) {
case IEEE80211_STYPE_AUTH:
case IEEE80211_STYPE_DEAUTH:
case IEEE80211_STYPE_ASSOC_REQ:
diff --git a/drivers/net/wireless/iwl-base.c b/drivers/net/wireless/iwl-base.c
index 2c107e7..a6cac9c 100644
--- a/drivers/net/wireless/iwl-base.c
+++ b/drivers/net/wireless/iwl-base.c
@@ -1718,7 +1718,7 @@ void iwl_report_frame(struct iwl_priv *priv,
u32 print_dump = 0; /* set to 1 to dump all frames' contents */
u32 hundred = 0;
u32 dataframe = 0;
- u16 frame_ctl;
+ u16 fc;
u16 seq_ctl;
u16 channel;
u16 phy_flags;
@@ -1738,7 +1738,7 @@ void iwl_report_frame(struct iwl_priv *priv,
u8 *data = IWL_RX_DATA(pkt);
/* MAC header */
- frame_ctl = le16_to_cpu(header->frame_control);
+ fc = le16_to_cpu(header->frame_control);
seq_ctl = le16_to_cpu(header->seq_ctrl);
/* metadata */
@@ -1763,7 +1763,7 @@ void iwl_report_frame(struct iwl_priv *priv,
/* if data frame is to us and all is good,
* (optionally) print summary for only 1 out of every 100 */
- if (to_us && (frame_ctl & ~IEEE80211_FCTL_PROTECTED) ==
+ if (to_us && (fc & ~IEEE80211_FCTL_PROTECTED) ==
(IEEE80211_FCTL_FROMDS | IEEE80211_FTYPE_DATA)) {
dataframe = 1;
if (!group100)
@@ -1787,25 +1787,25 @@ void iwl_report_frame(struct iwl_priv *priv,
if (hundred)
title = "100Frames";
- else if (frame_ctl & IEEE80211_FCTL_RETRY)
+ else if (fc & IEEE80211_FCTL_RETRY)
title = "Retry";
- else if (ieee80211_is_assoc_response(frame_ctl))
+ else if (ieee80211_is_assoc_response(fc))
title = "AscRsp";
- else if (ieee80211_is_reassoc_response(frame_ctl))
+ else if (ieee80211_is_reassoc_response(fc))
title = "RasRsp";
- else if (ieee80211_is_probe_response(frame_ctl)) {
+ else if (ieee80211_is_probe_response(fc)) {
title = "PrbRsp";
print_dump = 1; /* dump frame contents */
- } else if (ieee80211_is_beacon(frame_ctl)) {
+ } else if (ieee80211_is_beacon(fc)) {
title = "Beacon";
print_dump = 1; /* dump frame contents */
- } else if (ieee80211_is_atim(frame_ctl))
+ } else if (ieee80211_is_atim(fc))
title = "ATIM";
- else if (ieee80211_is_auth(frame_ctl))
+ else if (ieee80211_is_auth(fc))
title = "Auth";
- else if (ieee80211_is_deauth(frame_ctl))
+ else if (ieee80211_is_deauth(fc))
title = "DeAuth";
- else if (ieee80211_is_disassoc(frame_ctl))
+ else if (ieee80211_is_disassoc(fc))
title = "DisAssoc";
else
title = "Frame";
@@ -1822,14 +1822,14 @@ void iwl_report_frame(struct iwl_priv *priv,
if (dataframe)
IWL_DEBUG_RX("%s: mhd=0x%04x, dst=0x%02x, "
"len=%u, rssi=%d, chnl=%d, rate=%u, \n",
- title, frame_ctl, header->addr1[5],
+ title, fc, header->addr1[5],
length, rssi, channel, rate);
else {
/* src/dst addresses assume managed mode */
IWL_DEBUG_RX("%s: 0x%04x, dst=0x%02x, "
"src=0x%02x, rssi=%u, tim=%lu usec, "
"phy=0x%02x, chnl=%d\n",
- title, frame_ctl, header->addr1[5],
+ title, fc, header->addr1[5],
header->addr3[5], rssi,
tsf_low - priv->scan_start_tsf,
phy_flags, channel);
--
1.5.2
-
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
