Commit c198059e authored by Ivan Safonov's avatar Ivan Safonov Committed by Greg Kroah-Hartman
Browse files

staging:rtl8712: replace get_(d|s)a with ieee80211_get_(D|S)A 



get_da()/get_sa() duplicate native ieee80211_get_(D|S)A functions.
Remove get_(d|s)a, use ieee80211_get_(D|S)A instead.

Signed-off-by: default avatarIvan Safonov <insafonov@gmail.com>
Link: https://lore.kernel.org/r/20210227222236.581490-2-insafonov@gmail.com


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

drivers/staging/rtl8712/rtl871x_recv.c

+2 −2
Original line number Diff line number Diff line
@@ -466,8 +466,8 @@ static sint validate_recv_data_frame(struct _adapter *adapter, 
	struct security_priv *psecuritypriv = &adapter->securitypriv;



	bretry = GetRetry(ptr);

	pda = get_da(ptr);

	psa = get_sa(ptr);

	pda = ieee80211_get_DA((struct ieee80211_hdr *)ptr);

	psa = ieee80211_get_SA((struct ieee80211_hdr *)ptr);

	pbssid = get_hdr_bssid(ptr);

	if (!pbssid)

		return _FAIL;

drivers/staging/rtl8712/wifi.h

+0 −45
Original line number Diff line number Diff line
@@ -264,51 +264,6 @@ static inline unsigned char get_tofr_ds(unsigned char *pframe) 


#define GetAddr4Ptr(pbuf)	((unsigned char *)((addr_t)(pbuf) + 24))



static inline unsigned char *get_da(unsigned char *pframe)

{

	unsigned char	*da;

	unsigned int	to_fr_ds = (GetToDs(pframe) << 1) | GetFrDs(pframe);



	switch (to_fr_ds) {

	case 0x00:	/* ToDs=0, FromDs=0 */

		da = GetAddr1Ptr(pframe);

		break;

	case 0x01:	/* ToDs=0, FromDs=1 */

		da = GetAddr1Ptr(pframe);

		break;

	case 0x02:	/* ToDs=1, FromDs=0 */

		da = GetAddr3Ptr(pframe);

		break;

	default:	/* ToDs=1, FromDs=1 */

		da = GetAddr3Ptr(pframe);

		break;

	}

	return da;

}



static inline unsigned char *get_sa(unsigned char *pframe)

{

	unsigned char	*sa;

	unsigned int	to_fr_ds = (GetToDs(pframe) << 1) | GetFrDs(pframe);



	switch (to_fr_ds) {

	case 0x00:	/* ToDs=0, FromDs=0 */

		sa = GetAddr2Ptr(pframe);

		break;

	case 0x01:	/* ToDs=0, FromDs=1 */

		sa = GetAddr3Ptr(pframe);

		break;

	case 0x02:	/* ToDs=1, FromDs=0 */

		sa = GetAddr2Ptr(pframe);

		break;

	default:	/* ToDs=1, FromDs=1 */

		sa = GetAddr4Ptr(pframe);

		break;

	}



	return sa;

}



static inline unsigned char *get_hdr_bssid(unsigned char *pframe)

{

	unsigned char	*sa;