From 5ded2b3ded6186608d6d6f5535a98938105a5e43 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Fri, 20 Feb 2015 09:37:42 -0600 Subject: [PATCH] rtl8188eu: Remove CONFIG_XMIT_ACK and CONFIG_XMIT_ACK_POLLING The first one was always selected. The second was not selected. Signed-off-by: Larry Finger --- core/rtw_mlme_ext.c | 8 ----- core/rtw_xmit.c | 66 ----------------------------------------- hal/rtl8188e_xmit.c | 2 -- hal/rtl8188eu_xmit.c | 2 -- hal/usb_halinit.c | 2 -- include/autoconf.h | 6 +--- include/rtl8188e_xmit.h | 5 ---- include/rtl8192c_xmit.h | 5 ---- include/rtw_xmit.h | 6 ---- os_dep/usb_intf.c | 2 -- 10 files changed, 1 insertion(+), 103 deletions(-) diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index 37428f1..b17f4ce 100755 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -5822,7 +5822,6 @@ s32 dump_mgntframe_and_wait(struct adapter *padapter, struct xmit_frame *pmgntfr s32 dump_mgntframe_and_wait_ack(struct adapter *padapter, struct xmit_frame *pmgntframe) { -#ifdef CONFIG_XMIT_ACK s32 ret = _FAIL; u32 timeout_ms = 500;/* 500ms */ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; @@ -5847,11 +5846,6 @@ s32 dump_mgntframe_and_wait_ack(struct adapter *padapter, struct xmit_frame *pmg _exit_critical_mutex(&pxmitpriv->ack_tx_mutex, NULL); 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) @@ -5862,8 +5856,6 @@ static int update_hidden_ssid(u8 *ies, u32 ies_len, u8 hidden_ssid_mode) ssid_ie = rtw_get_ie(ies, WLAN_EID_SSID, &ssid_len_ori, ies_len); - /* DBG_871X("%s hidden_ssid_mode:%u, ssid_ie:%p, ssid_len_ori:%d\n", __FUNCTION__, hidden_ssid_mode, ssid_ie, ssid_len_ori); */ - if(ssid_ie && ssid_len_ori>0) { switch(hidden_ssid_mode) diff --git a/core/rtw_xmit.c b/core/rtw_xmit.c index a8fd2f3..ddf00a9 100755 --- a/core/rtw_xmit.c +++ b/core/rtw_xmit.c @@ -295,12 +295,9 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitpriv->viq_cnt = 0; pxmitpriv->voq_cnt = 0; -#ifdef CONFIG_XMIT_ACK pxmitpriv->ack_tx = false; _rtw_mutex_init(&pxmitpriv->ack_tx_mutex); rtw_sctx_init(&pxmitpriv->ack_tx_ops, 0); -#endif - rtw_hal_init_xmit_priv(padapter); exit: @@ -407,9 +404,7 @@ void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv) rtw_free_hwxmits(padapter); -#ifdef CONFIG_XMIT_ACK _rtw_mutex_free(&pxmitpriv->ack_tx_mutex); -#endif out: @@ -2413,10 +2408,7 @@ static void rtw_init_xmitframe(struct xmit_frame *pxframe) pxframe->agg_num = 1; #endif -#ifdef CONFIG_XMIT_ACK pxframe->ack_report = 0; -#endif - } } @@ -4066,59 +4058,6 @@ void rtw_sctx_done(struct submit_ctx **sctx) rtw_sctx_done_err(sctx, RTW_SCTX_DONE_SUCCESS); } -#ifdef CONFIG_XMIT_ACK - -#ifdef CONFIG_XMIT_ACK_POLLING -s32 c2h_evt_hdl(struct 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; - struct adapter *adapter = container_of(pxmitpriv, struct 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_871X("%s timeout\n", __func__); - } - - if (pack_tx_ops->status == RTW_SCTX_DONE_SUCCESS) - ret = _SUCCESS; - - return ret; -} -#endif - #ifdef CONFIG_DETECT_C2H_BY_POLLING s32 c2h_evt_hdl(struct adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter); #endif @@ -4178,9 +4117,6 @@ int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms) ret = _SUCCESS; return ret; -#else -#ifdef CONFIG_XMIT_ACK_POLLING - return rtw_ack_tx_polling(pxmitpriv, timeout_ms); #else struct submit_ctx *pack_tx_ops = &pxmitpriv->ack_tx_ops; @@ -4190,7 +4126,6 @@ int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms) return rtw_sctx_wait(pack_tx_ops); #endif -#endif } void rtw_ack_tx_done(struct xmit_priv *pxmitpriv, int status) @@ -4203,4 +4138,3 @@ void rtw_ack_tx_done(struct xmit_priv *pxmitpriv, int status) DBG_871X("%s ack_tx not set\n", __func__); } } -#endif /* CONFIG_XMIT_ACK */ diff --git a/hal/rtl8188e_xmit.c b/hal/rtl8188e_xmit.c index 985f0b7..673b00a 100755 --- a/hal/rtl8188e_xmit.c +++ b/hal/rtl8188e_xmit.c @@ -24,7 +24,6 @@ #include #include -#ifdef CONFIG_XMIT_ACK void dump_txrpt_ccx_88e(void *buf) { struct txrpt_ccx_88e *txrpt_ccx = (struct txrpt_ccx_88e *)buf; @@ -61,7 +60,6 @@ void handle_txrpt_ccx_88e(struct adapter *adapter, u8 *buf) rtw_ack_tx_done(&adapter->xmitpriv, RTW_SCTX_DONE_CCX_PKT_FAIL); } } -#endif /* CONFIG_XMIT_ACK */ void _dbg_dump_tx_info(struct adapter *padapter,int frame_tag,struct tx_desc *ptxdesc) { diff --git a/hal/rtl8188eu_xmit.c b/hal/rtl8188eu_xmit.c index ef80af1..56d22f2 100755 --- a/hal/rtl8188eu_xmit.c +++ b/hal/rtl8188eu_xmit.c @@ -414,7 +414,6 @@ if (padapter->registrypriv.mp_mode == 0) /* fill_txdesc_sectype(pattrib, ptxdesc); */ /* offset 8 */ -#ifdef CONFIG_XMIT_ACK /* CCX-TXRPT ack for xmit mgmt frames. */ if (pxmitframe->ack_report) { #ifdef DBG_CCX @@ -425,7 +424,6 @@ if (padapter->registrypriv.mp_mode == 0) #endif ptxdesc->txdw2 |= cpu_to_le32(BIT(19)); } -#endif /* CONFIG_XMIT_ACK */ /* offset 12 */ ptxdesc->txdw3 |= cpu_to_le32((pattrib->seqnum<ccx_qtime0+((txrpt_ccx)->ccx_qtime1<<8)) -#ifdef CONFIG_XMIT_ACK void dump_txrpt_ccx_8192c(void *buf); void handle_txrpt_ccx_8192c(struct adapter *adapter, void *buf); -#else -#define dump_txrpt_ccx_8192c(buf) do {} while(0) -#define handle_txrpt_ccx_8192c(adapter, buf) do {} while(0) -#endif #ifdef CONFIG_USB_TX_AGGREGATION #define MAX_TX_AGG_PACKET_NUMBER 0xFF diff --git a/include/rtw_xmit.h b/include/rtw_xmit.h index 87fccfe..1128b7c 100755 --- a/include/rtw_xmit.h +++ b/include/rtw_xmit.h @@ -289,9 +289,7 @@ struct xmit_frame #endif s8 pkt_offset; -#ifdef CONFIG_XMIT_ACK u8 ack_report; -#endif u8 *alloc_addr; /* the actual address this xmitframe allocated */ u8 ext_tag; /* 0:data, 1:mgmt */ @@ -431,11 +429,9 @@ struct xmit_priv { struct agg_pkt_info agg_pkt[MAX_AGG_PKT_NUM]; #endif -#ifdef CONFIG_XMIT_ACK int ack_tx; _mutex ack_tx_mutex; struct submit_ctx ack_tx_ops; -#endif _lock lock_sctx; }; @@ -507,10 +503,8 @@ thread_return rtw_xmit_thread(thread_context context); 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); 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 diff --git a/os_dep/usb_intf.c b/os_dep/usb_intf.c index 58b7105..4b737bb 100755 --- a/os_dep/usb_intf.c +++ b/os_dep/usb_intf.c @@ -466,10 +466,8 @@ void rtw_dev_unload(struct adapter *padapter) DBG_871X("===> rtw_dev_unload\n"); padapter->bDriverStopped = true; - #ifdef CONFIG_XMIT_ACK if (padapter->xmitpriv.ack_tx) rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_DRV_STOP); - #endif /* s3. */ if(padapter->intf_stop)