openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

rsi: Update aggregation parameters command frame 

AMPDU aggregation parameters frame configured to device is
modified to use common descriptor structure.

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-07-10 18:10:37 +05:30 committed by Kalle Valo
parent 59e006dc77
commit 3a9828c92b
2 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -528,10 +528,11 @@ int rsi_send_aggregation_params_frame(struct rsi_common *common,
u8 event) u8 event)
{ {
struct sk_buff *skb = NULL; struct sk_buff *skb = NULL;
struct rsi_mac_frame *mgmt_frame; struct rsi_aggr_params *aggr_params;
u8 peer_id = 0; u8 peer_id = 0;
u16 frame_len = sizeof(struct rsi_aggr_params);
skb = dev_alloc_skb(FRAME_DESC_SZ); skb = dev_alloc_skb(frame_len);
if (!skb) { if (!skb) {
rsi_dbg(ERR_ZONE, "%s: Failed in allocation of skb\n", rsi_dbg(ERR_ZONE, "%s: Failed in allocation of skb\n",
@ -539,37 +540,29 @@ int rsi_send_aggregation_params_frame(struct rsi_common *common,
return -ENOMEM; return -ENOMEM;
} }
memset(skb->data, 0, FRAME_DESC_SZ); memset(skb->data, 0, frame_len);
mgmt_frame = (struct rsi_mac_frame *)skb->data; aggr_params = (struct rsi_aggr_params *)skb->data;
rsi_dbg(MGMT_TX_ZONE, "%s: Sending AMPDU indication frame\n", __func__); rsi_dbg(MGMT_TX_ZONE, "%s: Sending AMPDU indication frame\n", __func__);
mgmt_frame->desc_word[0] = cpu_to_le16(RSI_WIFI_MGMT_Q << 12); rsi_set_len_qno(&aggr_params->desc_dword0.len_qno, 0, RSI_WIFI_MGMT_Q);
mgmt_frame->desc_word[1] = cpu_to_le16(AMPDU_IND); aggr_params->desc_dword0.frame_type = AMPDU_IND;
aggr_params->aggr_params = tid & RSI_AGGR_PARAMS_TID_MASK;
aggr_params->peer_id = peer_id;
if (event == STA_TX_ADDBA_DONE) { if (event == STA_TX_ADDBA_DONE) {
mgmt_frame->desc_word[4] = cpu_to_le16(ssn); aggr_params->seq_start = cpu_to_le16(ssn);
mgmt_frame->desc_word[5] = cpu_to_le16(buf_size); aggr_params->baw_size = cpu_to_le16(buf_size);
mgmt_frame->desc_word[7] = aggr_params->aggr_params |= RSI_AGGR_PARAMS_START;
cpu_to_le16((tid | (START_AMPDU_AGGR << 4) | (peer_id << 8)));
} else if (event == STA_RX_ADDBA_DONE) { } else if (event == STA_RX_ADDBA_DONE) {
mgmt_frame->desc_word[4] = cpu_to_le16(ssn); aggr_params->seq_start = cpu_to_le16(ssn);
mgmt_frame->desc_word[7] = cpu_to_le16(tid | aggr_params->aggr_params |= (RSI_AGGR_PARAMS_START |
(START_AMPDU_AGGR << 4) | RSI_AGGR_PARAMS_RX_AGGR);
(RX_BA_INDICATION << 5) |
(peer_id << 8));
} else if (event == STA_TX_DELBA) {
mgmt_frame->desc_word[7] = cpu_to_le16(tid |
(STOP_AMPDU_AGGR << 4) |
(peer_id << 8));
} else if (event == STA_RX_DELBA) { } else if (event == STA_RX_DELBA) {
mgmt_frame->desc_word[7] = cpu_to_le16(tid | aggr_params->aggr_params |= RSI_AGGR_PARAMS_RX_AGGR;
(STOP_AMPDU_AGGR << 4) |
(RX_BA_INDICATION << 5) |
(peer_id << 8));
} }
skb_put(skb, FRAME_DESC_SZ); skb_put(skb, frame_len);
return rsi_send_internal_mgmt_frame(common, skb); return rsi_send_internal_mgmt_frame(common, skb);
} }

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

@ -280,6 +280,20 @@ struct rsi_peer_notify {
__le32 sta_flags; __le32 sta_flags;
} __packed; } __packed;
/* Aggregation params flags */
#define RSI_AGGR_PARAMS_TID_MASK 0xf
#define RSI_AGGR_PARAMS_START BIT(4)
#define RSI_AGGR_PARAMS_RX_AGGR BIT(5)
struct rsi_aggr_params {
struct rsi_cmd_desc_dword0 desc_dword0;
struct rsi_cmd_desc_dword0 desc_dword1;
__le16 seq_start;
__le16 baw_size;
__le16 token;
u8 aggr_params;
u8 peer_id;
} __packed;
struct rsi_vap_caps { struct rsi_vap_caps {
__le16 desc_word[8]; __le16 desc_word[8];
u8 mac_addr[6]; u8 mac_addr[6];