Commit f59edab8 authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Use standard function in softmac_mgmt_xmit() 



Use standard function ieee80211_is_beacon() to avoid proprietary code to
identify beacon and to increase readability in softmac_mgmt_xmit() and
_rtl92e_translate_rx_signal_stats()

Signed-off-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/bd648e8e3c9c93c7944b72778ef7288973d8386e.1694546300.git.philipp.g.hortmann@gmail.com


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

drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -1584,7 +1584,7 @@ static void _rtl92e_translate_rx_signal_stats(struct net_device *dev, 
		 (!pstats->bHwError) && (!pstats->bCRC) && (!pstats->bICV));

	bpacket_toself = bpacket_match_bssid &&		/* check this */

			 ether_addr_equal(praddr, priv->rtllib->dev->dev_addr);

	if (WLAN_FC_GET_FRAMETYPE(fc) == RTLLIB_STYPE_BEACON)

	if (ieee80211_is_beacon(hdr->frame_ctl))

		bPacketBeacon = true;

	_rtl92e_process_phyinfo(priv, tmp_buf, &previous_stats, pstats);

	_rtl92e_query_rxphystatus(priv, pstats, pdesc, pdrvinfo,

drivers/staging/rtl8192e/rtllib.h

+0 −1
Original line number Diff line number Diff line
@@ -459,7 +459,6 @@ enum _REG_PREAMBLE_MODE { 
#define WLAN_FC_GET_STYPE(fc) ((fc) & RTLLIB_FCTL_STYPE)

#define WLAN_FC_MORE_DATA(fc) ((fc) & RTLLIB_FCTL_MOREDATA)



#define WLAN_FC_GET_FRAMETYPE(fc) ((fc) & RTLLIB_FCTL_FRAMETYPE)

#define WLAN_GET_SEQ_FRAG(seq) ((seq) & RTLLIB_SCTL_FRAG)

#define WLAN_GET_SEQ_SEQ(seq)  (((seq) & RTLLIB_SCTL_SEQ) >> 4)

drivers/staging/rtl8192e/rtllib_softmac.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct rtllib_device *ieee) 
	/* called with 2nd param 0, no mgmt lock required */

	rtllib_sta_wakeup(ieee, 0);



	if (le16_to_cpu(header->frame_ctl) == RTLLIB_STYPE_BEACON)

	if (ieee80211_is_beacon(header->frame_ctl))

		tcb_desc->queue_index = BEACON_QUEUE;

	else

		tcb_desc->queue_index = MGNT_QUEUE;