Commit daeb5bb4 authored by Avinash Patil's avatar Avinash Patil Committed by John W. Linville

mwifiex: AMPDU support for TDLS link

This patch adds AMPDU support for TDLS link. We have set 11n
capabilities including AMPDU parameters during ENABLE_LINK.
We set a variable in RA list to indicate this as TDLS link.
This patch uses these capabilities to know if AMPDU is allowed
on TDLS link and enables AMPDU aggregation for TX and RX reording
support for RA list for this peer.
Signed-off-by: default avatarAvinash Patil <patila@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d63bf5e5
...@@ -81,11 +81,15 @@ static inline u8 ...@@ -81,11 +81,15 @@ static inline u8
mwifiex_is_ampdu_allowed(struct mwifiex_private *priv, mwifiex_is_ampdu_allowed(struct mwifiex_private *priv,
struct mwifiex_ra_list_tbl *ptr, int tid) struct mwifiex_ra_list_tbl *ptr, int tid)
{ {
if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_UAP) if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_UAP) {
return mwifiex_is_station_ampdu_allowed(priv, ptr, tid); return mwifiex_is_station_ampdu_allowed(priv, ptr, tid);
else } else {
if (ptr->tdls_link)
return mwifiex_is_station_ampdu_allowed(priv, ptr, tid);
return (priv->aggr_prio_tbl[tid].ampdu_ap != return (priv->aggr_prio_tbl[tid].ampdu_ap !=
BA_STREAM_NOT_ALLOWED) ? true : false; BA_STREAM_NOT_ALLOWED) ? true : false;
}
} }
/* /*
...@@ -179,4 +183,14 @@ static inline int mwifiex_is_sta_11n_enabled(struct mwifiex_private *priv, ...@@ -179,4 +183,14 @@ static inline int mwifiex_is_sta_11n_enabled(struct mwifiex_private *priv,
return node->is_11n_enabled; return node->is_11n_enabled;
} }
static inline u8
mwifiex_tdls_peer_11n_enabled(struct mwifiex_private *priv, u8 *ra)
{
struct mwifiex_sta_node *node = mwifiex_get_sta_entry(priv, ra);
if (node)
return node->is_11n_enabled;
return false;
}
#endif /* !_MWIFIEX_11N_H_ */ #endif /* !_MWIFIEX_11N_H_ */
...@@ -290,6 +290,10 @@ mwifiex_11n_create_rx_reorder_tbl(struct mwifiex_private *priv, u8 *ta, ...@@ -290,6 +290,10 @@ mwifiex_11n_create_rx_reorder_tbl(struct mwifiex_private *priv, u8 *ta,
last_seq = node->rx_seq[tid]; last_seq = node->rx_seq[tid];
} }
} else { } else {
node = mwifiex_get_sta_entry(priv, ta);
if (node)
last_seq = node->rx_seq[tid];
else
last_seq = priv->rx_seq[tid]; last_seq = priv->rx_seq[tid];
} }
......
...@@ -210,6 +210,7 @@ struct mwifiex_ra_list_tbl { ...@@ -210,6 +210,7 @@ struct mwifiex_ra_list_tbl {
u16 ba_pkt_count; u16 ba_pkt_count;
u8 ba_packet_thr; u8 ba_packet_thr;
u16 total_pkt_count; u16 total_pkt_count;
bool tdls_link;
}; };
struct mwifiex_tid_tbl { struct mwifiex_tid_tbl {
......
...@@ -49,6 +49,7 @@ mwifiex_restore_tdls_packets(struct mwifiex_private *priv, u8 *mac, u8 status) ...@@ -49,6 +49,7 @@ mwifiex_restore_tdls_packets(struct mwifiex_private *priv, u8 *mac, u8 status)
if (status == TDLS_SETUP_COMPLETE) { if (status == TDLS_SETUP_COMPLETE) {
ra_list = mwifiex_wmm_get_queue_raptr(priv, tid, mac); ra_list = mwifiex_wmm_get_queue_raptr(priv, tid, mac);
ra_list->tdls_link = true;
tx_info->flags |= MWIFIEX_BUF_FLAG_TDLS_PKT; tx_info->flags |= MWIFIEX_BUF_FLAG_TDLS_PKT;
} else { } else {
tid_list = &priv->wmm.tid_tbl_ptr[tid_down].ra_list; tid_list = &priv->wmm.tid_tbl_ptr[tid_down].ra_list;
......
...@@ -160,8 +160,15 @@ mwifiex_ralist_add(struct mwifiex_private *priv, u8 *ra) ...@@ -160,8 +160,15 @@ mwifiex_ralist_add(struct mwifiex_private *priv, u8 *ra)
break; break;
ra_list->is_11n_enabled = 0; ra_list->is_11n_enabled = 0;
ra_list->tdls_link = false;
if (!mwifiex_queuing_ra_based(priv)) { if (!mwifiex_queuing_ra_based(priv)) {
if (mwifiex_get_tdls_link_status(priv, ra) ==
TDLS_SETUP_COMPLETE) {
ra_list->is_11n_enabled =
mwifiex_tdls_peer_11n_enabled(priv, ra);
} else {
ra_list->is_11n_enabled = IS_11N_ENABLED(priv); ra_list->is_11n_enabled = IS_11N_ENABLED(priv);
}
} else { } else {
ra_list->is_11n_enabled = ra_list->is_11n_enabled =
mwifiex_is_sta_11n_enabled(priv, node); mwifiex_is_sta_11n_enabled(priv, node);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment