skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-10 07:29:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove CONFIG_XMIT_ACK and CONFIG_XMIT_ACK_POLLING

Browse source 
Parameter CONFIG_XMIT_ACK is always defined, and CONFIG_XMIT_ACK_POLLING
is not defined.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-18 23:43:54 -05:00
parent 9a0ed4ec27
commit 2462f06b0e
9 changed files with 0 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/rtw_mlme_ext.c
View file

@ -5441,7 +5441,6 @@ s32 dump_mgntframe_and_wait(_adapter *padapter, struct xmit_frame *pmgntframe, i
s32 dump_mgntframe_and_wait_ack(_adapter *padapter, struct xmit_frame *pmgntframe) s32 dump_mgntframe_and_wait_ack(_adapter *padapter, struct xmit_frame *pmgntframe)
{ {
#ifdef CONFIG_XMIT_ACK
s32 ret = _FAIL; s32 ret = _FAIL;
u32 timeout_ms = 500;/* 500ms */ u32 timeout_ms = 500;/* 500ms */
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -5462,11 +5461,6 @@ s32 dump_mgntframe_and_wait_ack(_adapter *padapter, struct xmit_frame *pmgntfram
_exit_critical_mutex(&pxmitpriv->ack_tx_mutex, NULL); _exit_critical_mutex(&pxmitpriv->ack_tx_mutex, NULL);
return ret; return ret;
#else /* CONFIG_XMIT_ACK */
dump_mgntframe(padapter, pmgntframe);
rtw_msleep_os(50);
return _SUCCESS;
#endif /* CONFIG_XMIT_ACK */
} }
static int update_hidden_ssid(u8 *ies, u32 ies_len, u8 hidden_ssid_mode) static int update_hidden_ssid(u8 *ies, u32 ies_len, u8 hidden_ssid_mode)

66
core/rtw_xmit.c
View file

@ -262,11 +262,9 @@ _func_enter_;
pxmitpriv->viq_cnt = 0; pxmitpriv->viq_cnt = 0;
pxmitpriv->voq_cnt = 0; pxmitpriv->voq_cnt = 0;
#ifdef CONFIG_XMIT_ACK
pxmitpriv->ack_tx = false; pxmitpriv->ack_tx = false;
_rtw_mutex_init(&pxmitpriv->ack_tx_mutex); _rtw_mutex_init(&pxmitpriv->ack_tx_mutex);
rtw_sctx_init(&pxmitpriv->ack_tx_ops, 0); rtw_sctx_init(&pxmitpriv->ack_tx_ops, 0);
#endif
rtw_hal_init_xmit_priv(padapter); rtw_hal_init_xmit_priv(padapter);
@ -363,14 +361,11 @@ void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv)
rtw_free_hwxmits(padapter); rtw_free_hwxmits(padapter);
#ifdef CONFIG_XMIT_ACK
_rtw_mutex_free(&pxmitpriv->ack_tx_mutex); _rtw_mutex_free(&pxmitpriv->ack_tx_mutex);
#endif
out: out:
_func_exit_; _func_exit_;
} }
static void update_attrib_vcs_info(_adapter *padapter, struct xmit_frame *pxmitframe) static void update_attrib_vcs_info(_adapter *padapter, struct xmit_frame *pxmitframe)
@ -1742,10 +1737,7 @@ _func_enter_;
pxframe->agg_num = 1; pxframe->agg_num = 1;
#endif #endif
#ifdef CONFIG_XMIT_ACK
pxframe->ack_report = 0; pxframe->ack_report = 0;
#endif
} }
_exit_critical_bh(&pfree_xmit_queue->lock, &irqL); _exit_critical_bh(&pfree_xmit_queue->lock, &irqL);
@ -3085,64 +3077,8 @@ void rtw_sctx_done(struct submit_ctx **sctx)
rtw_sctx_done_err(sctx, RTW_SCTX_DONE_SUCCESS); rtw_sctx_done_err(sctx, RTW_SCTX_DONE_SUCCESS);
} }
#ifdef CONFIG_XMIT_ACK
#ifdef CONFIG_XMIT_ACK_POLLING
s32 c2h_evt_hdl(_adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter);
/**
* rtw_ack_tx_polling -
* @pxmitpriv: xmit_priv to address ack_tx_ops
* @timeout_ms: timeout msec
*
* Init ack_tx_ops and then do c2h_evt_hdl() and polling ack_tx_ops repeatedly
* till tx report or timeout
* Returns: _SUCCESS if TX report ok, _FAIL for others
*/
int rtw_ack_tx_polling(struct xmit_priv *pxmitpriv, u32 timeout_ms)
{
int ret = _FAIL;
struct submit_ctx *pack_tx_ops = &pxmitpriv->ack_tx_ops;
_adapter *adapter = container_of(pxmitpriv, _adapter, xmitpriv);
pack_tx_ops->submit_time = rtw_get_current_time();
pack_tx_ops->timeout_ms = timeout_ms;
pack_tx_ops->status = RTW_SCTX_SUBMITTED;
do {
c2h_evt_hdl(adapter, NULL, rtw_hal_c2h_id_filter_ccx(adapter));
if (pack_tx_ops->status != RTW_SCTX_SUBMITTED)
break;
if (adapter->bDriverStopped) {
pack_tx_ops->status = RTW_SCTX_DONE_DRV_STOP;
break;
}
if (adapter->bSurpriseRemoved) {
pack_tx_ops->status = RTW_SCTX_DONE_DEV_REMOVE;
break;
}
rtw_msleep_os(10);
} while (rtw_get_passing_time_ms(pack_tx_ops->submit_time) < timeout_ms);
if (pack_tx_ops->status == RTW_SCTX_SUBMITTED) {
pack_tx_ops->status = RTW_SCTX_DONE_TIMEOUT;
DBG_88E("%s timeout\n", __func__);
}
if (pack_tx_ops->status == RTW_SCTX_DONE_SUCCESS)
ret = _SUCCESS;
return ret;
}
#endif
int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms) int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms)
{ {
#ifdef CONFIG_XMIT_ACK_POLLING
return rtw_ack_tx_polling(pxmitpriv, timeout_ms);
#else
struct submit_ctx *pack_tx_ops = &pxmitpriv->ack_tx_ops; struct submit_ctx *pack_tx_ops = &pxmitpriv->ack_tx_ops;
pack_tx_ops->submit_time = rtw_get_current_time(); pack_tx_ops->submit_time = rtw_get_current_time();
@ -3150,7 +3086,6 @@ int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms)
pack_tx_ops->status = RTW_SCTX_SUBMITTED; pack_tx_ops->status = RTW_SCTX_SUBMITTED;
return rtw_sctx_wait(pack_tx_ops); return rtw_sctx_wait(pack_tx_ops);
#endif
} }
void rtw_ack_tx_done(struct xmit_priv *pxmitpriv, int status) void rtw_ack_tx_done(struct xmit_priv *pxmitpriv, int status)
@ -3163,4 +3098,3 @@ void rtw_ack_tx_done(struct xmit_priv *pxmitpriv, int status)
DBG_88E("%s ack_tx not set\n", __func__); DBG_88E("%s ack_tx not set\n", __func__);
} }
} }
#endif /* CONFIG_XMIT_ACK */

2
hal/rtl8188e_xmit.c
View file

@ -24,7 +24,6 @@
#include <drv_types.h> #include <drv_types.h>
#include <rtl8188e_hal.h> #include <rtl8188e_hal.h>
#ifdef CONFIG_XMIT_ACK
void dump_txrpt_ccx_88e(void *buf) void dump_txrpt_ccx_88e(void *buf)
{ {
struct txrpt_ccx_88e *txrpt_ccx = (struct txrpt_ccx_88e *)buf; struct txrpt_ccx_88e *txrpt_ccx = (struct txrpt_ccx_88e *)buf;
@ -61,7 +60,6 @@ void handle_txrpt_ccx_88e(_adapter *adapter, u8 *buf)
rtw_ack_tx_done(&adapter->xmitpriv, RTW_SCTX_DONE_CCX_PKT_FAIL); rtw_ack_tx_done(&adapter->xmitpriv, RTW_SCTX_DONE_CCX_PKT_FAIL);
} }
} }
#endif /* CONFIG_XMIT_ACK */
void _dbg_dump_tx_info(_adapter *padapter,int frame_tag,struct tx_desc *ptxdesc) void _dbg_dump_tx_info(_adapter *padapter,int frame_tag,struct tx_desc *ptxdesc)
{ {

2
hal/rtl8188eu_xmit.c
View file

@ -368,7 +368,6 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag
/* offset 8 */ /* offset 8 */
#ifdef CONFIG_XMIT_ACK
/* CCX-TXRPT ack for xmit mgmt frames. */ /* CCX-TXRPT ack for xmit mgmt frames. */
if (pxmitframe->ack_report) { if (pxmitframe->ack_report) {
#ifdef DBG_CCX #ifdef DBG_CCX
@ -379,7 +378,6 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag
#endif #endif
ptxdesc->txdw2 |= cpu_to_le32(BIT(19)); ptxdesc->txdw2 |= cpu_to_le32(BIT(19));
} }
#endif /* CONFIG_XMIT_ACK */
/* offset 12 */ /* offset 12 */
ptxdesc->txdw3 |= cpu_to_le32((pattrib->seqnum<<SEQ_SHT)&0x0FFF0000); ptxdesc->txdw3 |= cpu_to_le32((pattrib->seqnum<<SEQ_SHT)&0x0FFF0000);

2
hal/usb_halinit.c
View file

@ -1565,10 +1565,8 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_LCK);
/* _InitPABias(Adapter); */ /* _InitPABias(Adapter); */
rtw_write8(Adapter, REG_USB_HRPWM, 0); rtw_write8(Adapter, REG_USB_HRPWM, 0);
#ifdef CONFIG_XMIT_ACK
/* ack for xmit mgmt frames. */ /* ack for xmit mgmt frames. */
rtw_write32(Adapter, REG_FWHW_TXQ_CTRL, rtw_read32(Adapter, REG_FWHW_TXQ_CTRL)|BIT(12)); rtw_write32(Adapter, REG_FWHW_TXQ_CTRL, rtw_read32(Adapter, REG_FWHW_TXQ_CTRL)|BIT(12));
#endif /* CONFIG_XMIT_ACK */
exit: exit:
HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_END); HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_END);

11
include/autoconf.h
View file

@ -44,25 +44,14 @@
#define CONFIG_EMBEDDED_FWIMG #define CONFIG_EMBEDDED_FWIMG
#define CONFIG_XMIT_ACK
#ifdef CONFIG_XMIT_ACK
#define CONFIG_ACTIVE_KEEP_ALIVE_CHECK
#endif
#define CONFIG_80211N_HT #define CONFIG_80211N_HT
#define CONFIG_SUPPORT_USB_INT #define CONFIG_SUPPORT_USB_INT
#ifdef CONFIG_SUPPORT_USB_INT
#endif
#define CONFIG_IPS #define CONFIG_IPS
#ifdef CONFIG_IPS
#endif
#define SUPPORT_HW_RFOFF_DETECTED #define SUPPORT_HW_RFOFF_DETECTED
#define CONFIG_LPS #define CONFIG_LPS
#if defined(CONFIG_LPS) && defined(CONFIG_SUPPORT_USB_INT)
#endif
#ifdef CONFIG_LPS_LCLK #ifdef CONFIG_LPS_LCLK
#define CONFIG_XMIT_THREAD_MODE #define CONFIG_XMIT_THREAD_MODE

5
include/rtl8188e_xmit.h
View file

@ -268,13 +268,8 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
void UpdateEarlyModeInfo8188E(struct xmit_priv *pxmitpriv,struct xmit_buf *pxmitbuf ); void UpdateEarlyModeInfo8188E(struct xmit_priv *pxmitpriv,struct xmit_buf *pxmitbuf );
#endif #endif
#ifdef CONFIG_XMIT_ACK
void dump_txrpt_ccx_88e(void *buf); void dump_txrpt_ccx_88e(void *buf);
void handle_txrpt_ccx_88e(_adapter *adapter, u8 *buf); void handle_txrpt_ccx_88e(_adapter *adapter, u8 *buf);
#else
#define dump_txrpt_ccx_88e(buf) do {} while (0)
#define handle_txrpt_ccx_88e(adapter, buf) do {} while (0)
#endif //CONFIG_XMIT_ACK
void _dbg_dump_tx_info(_adapter *padapter,int frame_tag,struct tx_desc *ptxdesc); void _dbg_dump_tx_info(_adapter *padapter,int frame_tag,struct tx_desc *ptxdesc);
#endif //__RTL8188E_XMIT_H__ #endif //__RTL8188E_XMIT_H__

7
include/rtw_xmit.h
View file

@ -271,9 +271,7 @@ struct xmit_frame
#endif #endif
s8 pkt_offset; s8 pkt_offset;
#ifdef CONFIG_XMIT_ACK
u8 ack_report; u8 ack_report;
#endif
}; };
struct tx_servq { struct tx_servq {
@ -402,12 +400,9 @@ struct xmit_priv {
struct agg_pkt_info agg_pkt[MAX_AGG_PKT_NUM]; struct agg_pkt_info agg_pkt[MAX_AGG_PKT_NUM];
#endif #endif
#ifdef CONFIG_XMIT_ACK
int ack_tx; int ack_tx;
_mutex ack_tx_mutex; _mutex ack_tx_mutex;
struct submit_ctx ack_tx_ops; struct submit_ctx ack_tx_ops;
#endif
}; };
extern struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv); extern struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv);
@ -470,10 +465,8 @@ thread_return rtw_xmit_thread(thread_context context);
u32 rtw_get_ff_hwaddr(struct xmit_frame *pxmitframe); u32 rtw_get_ff_hwaddr(struct xmit_frame *pxmitframe);
#ifdef CONFIG_XMIT_ACK
int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms); int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms);
void rtw_ack_tx_done(struct xmit_priv *pxmitpriv, int status); void rtw_ack_tx_done(struct xmit_priv *pxmitpriv, int status);
#endif //CONFIG_XMIT_ACK
//include after declaring struct xmit_buf, in order to avoid warning //include after declaring struct xmit_buf, in order to avoid warning

2
os_dep/usb_intf.c
View file

@ -424,10 +424,8 @@ static void rtw_dev_unload(_adapter *padapter)
DBG_88E("===> rtw_dev_unload\n"); DBG_88E("===> rtw_dev_unload\n");
padapter->bDriverStopped = true; padapter->bDriverStopped = true;
#ifdef CONFIG_XMIT_ACK
if (padapter->xmitpriv.ack_tx) if (padapter->xmitpriv.ack_tx)
rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_DRV_STOP); rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_DRV_STOP);
#endif
//s3. //s3.
if (padapter->intf_stop) if (padapter->intf_stop)