Commit 3e450386 authored by Juhee Kang's avatar Juhee Kang Committed by Kalle Valo
Browse files

wifi: rtlwifi: use helper function rtl_get_hdr() 



Although rtl_get_hdr was added in commit 3dad618b ("rtlwifi: Change
wifi.h for rtl8192se and rtl8192de"), it is currently not being utilized
in some areas. This commit replaces the open code with the rtl_get_hdr()
function.

Signed-off-by: default avatarJuhee Kang <claudiajkang@gmail.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230527114954.3281-1-claudiajkang@gmail.com
parent 1f1784a5

drivers/net/wireless/realtek/rtlwifi/base.c

+2 −2
Original line number Diff line number Diff line
@@ -1905,7 +1905,7 @@ EXPORT_SYMBOL(rtl_rx_ampdu_apply); 
void rtl_beacon_statistic(struct ieee80211_hw *hw, struct sk_buff *skb)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	struct ieee80211_hdr *hdr = rtl_get_hdr(skb);



	if (rtlpriv->mac80211.opmode != NL80211_IFTYPE_STATION)

		return;
@@ -1991,7 +1991,7 @@ void rtl_scan_list_expire(struct ieee80211_hw *hw) 
void rtl_collect_scan_list(struct ieee80211_hw *hw, struct sk_buff *skb)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	struct ieee80211_hdr *hdr = rtl_get_hdr(skb);

	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));

	unsigned long flags;

drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c

+1 −1
Original line number Diff line number Diff line
@@ -674,7 +674,7 @@ void rtl88ee_tx_fill_cmddesc(struct ieee80211_hw *hw, 
	u8 fw_queue = QSLT_BEACON;

	__le32 *pdesc = (__le32 *)pdesc8;



	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data);

	struct ieee80211_hdr *hdr = rtl_get_hdr(skb);

	__le16 fc = hdr->frame_control;



	dma_addr_t mapping = dma_map_single(&rtlpci->pdev->dev, skb->data,

drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c

+1 −1
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ void rtl92ce_tx_fill_cmddesc(struct ieee80211_hw *hw, 
	u8 fw_queue = QSLT_BEACON;

	__le32 *pdesc = (__le32 *)pdesc8;



	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data);

	struct ieee80211_hdr *hdr = rtl_get_hdr(skb);

	__le16 fc = hdr->frame_control;



	dma_addr_t mapping = dma_map_single(&rtlpci->pdev->dev, skb->data,

drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c

+2 −2
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ static void _rtl_rx_process(struct ieee80211_hw *hw, struct sk_buff *skb) 
				 (struct rx_desc_92c *)rxdesc, p_drvinfo);

	}

	skb_pull(skb, (drvinfo_len + RTL_RX_DESC_SIZE));

	hdr = (struct ieee80211_hdr *)(skb->data);

	hdr = rtl_get_hdr(skb);

	fc = hdr->frame_control;

	bv = ieee80211_is_probe_resp(fc);

	if (bv)
@@ -632,7 +632,7 @@ void rtl92cu_tx_fill_cmddesc(struct ieee80211_hw *hw, 
{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	u8 fw_queue = QSLT_BEACON;

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data);

	struct ieee80211_hdr *hdr = rtl_get_hdr(skb);

	__le16 fc = hdr->frame_control;

	__le32 *pdesc = (__le32 *)pdesc8;

drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c

+1 −1
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ void rtl92de_tx_fill_cmddesc(struct ieee80211_hw *hw, 
	struct rtl_hal *rtlhal = rtl_hal(rtlpriv);

	u8 fw_queue = QSLT_BEACON;



	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data);

	struct ieee80211_hdr *hdr = rtl_get_hdr(skb);

	__le16 fc = hdr->frame_control;

	__le32 *pdesc = (__le32 *)pdesc8;