UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

rsi: use common descriptor for auto rate frame 

TX command frame auto rate request is modified to use common
descriptor struture.

Signed-off-by: Prameela Rani Garnepudi <prameela.j04cs@gmail.com>
Signed-off-by: Amitkumar Karwar <amit.karwar@redpinesignals.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Prameela Rani Garnepudi 2017-08-16 18:43:15 +05:30 committed by Kalle Valo
parent 19844c0a9a
commit 6572f054e9
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/wireless/rsi/rsi_91x_mgmt.c
View File

@ -1164,8 +1164,9 @@ static int rsi_send_auto_rate_request(struct rsi_common *common)
u32 rate_bitmap = common->bitrate_mask[band];
u16 *selected_rates, min_rate;
u16 frame_len = sizeof(struct rsi_auto_rate);
skb = dev_alloc_skb(sizeof(struct rsi_auto_rate));
skb = dev_alloc_skb(frame_len);
if (!skb) {
rsi_dbg(ERR_ZONE, "%s: Failed in allocation of skb\n",
__func__);
@ -1180,8 +1181,6 @@ static int rsi_send_auto_rate_request(struct rsi_common *common)
return -ENOMEM;
}
memset(skb->data, 0, sizeof(struct rsi_auto_rate));
auto_rate = (struct rsi_auto_rate *)skb->data;
auto_rate->aarf_rssi = cpu_to_le16(((u16)3 << 6) | (u16)(18 & 0x3f));
@ -1190,10 +1189,10 @@ static int rsi_send_auto_rate_request(struct rsi_common *common)
auto_rate->initial_boundary = cpu_to_le16(3);
auto_rate->max_threshold_limt = cpu_to_le16(27);
auto_rate->desc_word[1] = cpu_to_le16(AUTO_RATE_IND);
auto_rate->desc.desc_dword0.frame_type = AUTO_RATE_IND;
if (common->channel_width == BW_40MHZ)
auto_rate->desc_word[7] |= cpu_to_le16(1);
auto_rate->desc.desc_dword3.qid_tid = BW_40MHZ;
if (band == NL80211_BAND_2GHZ) {
min_rate = RSI_RATE_1;
@ -1259,15 +1258,12 @@ static int rsi_send_auto_rate_request(struct rsi_common *common)
auto_rate->num_supported_rates = cpu_to_le16(num_supported_rates * 2);
auto_rate->moderate_rate_inx = cpu_to_le16(num_supported_rates / 2);
auto_rate->desc_word[7] |= cpu_to_le16(0 << 8);
num_supported_rates *= 2;
auto_rate->desc_word[0] = cpu_to_le16((sizeof(*auto_rate) -
FRAME_DESC_SZ) |
(RSI_WIFI_MGMT_Q << 12));
rsi_set_len_qno(&auto_rate->desc.desc_dword0.len_qno,
(frame_len - FRAME_DESC_SZ), RSI_WIFI_MGMT_Q);
skb_put(skb,
sizeof(struct rsi_auto_rate));
skb_put(skb, frame_len);
kfree(selected_rates);
return rsi_send_internal_mgmt_frame(common, skb);

2
drivers/net/wireless/rsi/rsi_mgmt.h
View File

@ -425,7 +425,7 @@ struct rsi_set_key {
} __packed;
struct rsi_auto_rate {
__le16 desc_word[8];
struct rsi_cmd_desc desc;
__le16 failure_limit;
__le16 initial_boundary;
__le16 max_threshold_limt;