Commit aaa0bc19 authored by Ross Schmidt's avatar Ross Schmidt Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: replace _TIM_IE_ 



Replace unique _TIM_IE_ macro with kernel provided WLAN_EID_DS_PARAMS
from linux/ieee80211.h.

Signed-off-by: default avatarRoss Schmidt <ross.schm.dev@gmail.com>
Link: https://lore.kernel.org/r/20201208040733.379197-10-ross.schm.dev@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8f6a9446

drivers/staging/rtl8723bs/core/rtw_ap.c

+5 −5
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static void update_BCNTIM(struct adapter *padapter) 


		p = rtw_get_ie(

			pie + _FIXED_IE_LENGTH_,

			_TIM_IE_,

			WLAN_EID_TIM,

			&tim_ielen,

			pnetwork_mlmeext->IELength - _FIXED_IE_LENGTH_

		);
@@ -133,7 +133,7 @@ static void update_BCNTIM(struct adapter *padapter) 
				memcpy(pbackup_remainder_ie, premainder_ie, remainder_ielen);

		}



		*dst_ie++ = _TIM_IE_;

		*dst_ie++ = WLAN_EID_TIM;



		if ((pstapriv->tim_bitmap & 0xff00) && (pstapriv->tim_bitmap & 0x00fe))

			tim_ielen = 5;
@@ -301,7 +301,7 @@ void expire_timeout_chk(struct adapter *padapter) 


					/* to update bcn with tim_bitmap for this station */

					pstapriv->tim_bitmap |= BIT(psta->aid);

					update_beacon(padapter, _TIM_IE_, NULL, true);

					update_beacon(padapter, WLAN_EID_TIM, NULL, true);



					if (!pmlmeext->active_keep_alive_check)

						continue;
@@ -922,7 +922,7 @@ void start_bss_network(struct adapter *padapter, u8 *pbuf) 
	);



	if (pmlmeext->bstart_bss) {

		update_beacon(padapter, _TIM_IE_, NULL, true);

		update_beacon(padapter, WLAN_EID_TIM, NULL, true);



#ifndef CONFIG_INTERRUPT_BASED_TXBCN /* other case will  tx beacon when bcn interrupt coming in. */

		/* issue beacon frame */
@@ -1762,7 +1762,7 @@ void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx) 


		break;



	case _TIM_IE_:

	case WLAN_EID_TIM:



		update_BCNTIM(padapter);

drivers/staging/rtl8723bs/core/rtw_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -1703,7 +1703,7 @@ static void rtw_chk_hi_queue_hdl(struct adapter *padapter) 
			pstapriv->sta_dz_bitmap &= ~BIT(0);



			if (update_tim)

				update_beacon(padapter, _TIM_IE_, NULL, true);

				update_beacon(padapter, WLAN_EID_TIM, NULL, true);

		} else {/* re check again */

			rtw_chk_hi_queue_cmd(padapter);

		}

drivers/staging/rtl8723bs/core/rtw_recv.c

+2 −2
Original line number Diff line number Diff line
@@ -1158,7 +1158,7 @@ sint validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *precv_ 


					/* update BCN for TIM IE */

					/* update_BCNTIM(padapter); */

					update_beacon(padapter, _TIM_IE_, NULL, true);

					update_beacon(padapter, WLAN_EID_TIM, NULL, true);

				}



				/* spin_unlock_bh(&psta->sleep_q.lock); */
@@ -1184,7 +1184,7 @@ sint validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *precv_ 


					/* update BCN for TIM IE */

					/* update_BCNTIM(padapter); */

					update_beacon(padapter, _TIM_IE_, NULL, true);

					update_beacon(padapter, WLAN_EID_TIM, NULL, true);

				}

			}

		}

drivers/staging/rtl8723bs/core/rtw_xmit.c

+4 −4
Original line number Diff line number Diff line
@@ -2251,7 +2251,7 @@ sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fr 
			pstapriv->sta_dz_bitmap |= BIT(0);



			if (update_tim)

				update_beacon(padapter, _TIM_IE_, NULL, true);

				update_beacon(padapter, WLAN_EID_TIM, NULL, true);

			else

				chk_bmc_sleepq_cmd(padapter);
@@ -2308,7 +2308,7 @@ sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fr 


				if (update_tim)

					/* update BCN for TIM IE */

					update_beacon(padapter, _TIM_IE_, NULL, true);

					update_beacon(padapter, WLAN_EID_TIM, NULL, true);

			}



			ret = true;
@@ -2516,7 +2516,7 @@ _exit: 
	spin_unlock_bh(&pxmitpriv->lock);



	if (update_mask)

		update_beacon(padapter, _TIM_IE_, NULL, true);

		update_beacon(padapter, WLAN_EID_TIM, NULL, true);

}



void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *psta)
@@ -2579,7 +2579,7 @@ void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *pst 
		if ((psta->sleepq_ac_len == 0) && (!psta->has_legacy_ac) && (wmmps_ac)) {

			pstapriv->tim_bitmap &= ~BIT(psta->aid);



			update_beacon(padapter, _TIM_IE_, NULL, true);

			update_beacon(padapter, WLAN_EID_TIM, NULL, true);

		}

	}

drivers/staging/rtl8723bs/include/wifi.h

+0 −1
Original line number Diff line number Diff line
@@ -387,7 +387,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe) 


#define _FIXED_IE_LENGTH_			_BEACON_IE_OFFSET_



#define _TIM_IE_					5

#define _IBSS_PARA_IE_			6

#define _COUNTRY_IE_			7

#define _CHLGETXT_IE_			16

CRA Git | Maintained and supported by SUSTech CRA and CCSE