wifi: rtlwifi: use helper function rtl_get_hdr()

Although rtl_get_hdr was added in commit 3dad618b7b92 ("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: Juhee Kang <claudiajkang@gmail.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230527114954.3281-1-claudiajkang@gmail.com

diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c
index 9e7e98b55eff805cb76d9a8c1f67ade71ce89562..36ae9ba3ac01d511c78f569e20763b52c291f3cb 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/base.c
+++ b/drivers/net/wireless/realtek/rtlwifi/base.c
@@ -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;
 

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c
index 6e4741e9483f60a8232c62341da304986a6b62df..65ebe52883d3f5c399f039daad66be05d9ef54e1 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c
@@ -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,

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c
index 730c7e939bd2e0cdb0bdd74f8af65db1171fdde8..5376bb34251f7c5a29e43f78693f27836a4d8df5 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c
@@ -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,

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c
index ae3c4f97637ebcce2b89aa6032f98e04bde962d2..b70767e72f3d9b151e00b71f6863d7e58007e96a 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c
@@ -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;
 

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c
index 807b66c16e111ed5ba8d5677a1346e7e7b4eb90d..c09c0c3126658a16dd7dd25b0e04631305a61f13 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c
@@ -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;
 

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c
index 27fddbcade3258cff9eb2ae2eb29a506d9dd2a5d..7f294e698994792f60534f1b15573d8594b1f5ad 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c
@@ -528,7 +528,7 @@ void rtl8723e_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,

diff --git a/drivers/net/wireless/realtek/rtlwifi/usb.c b/drivers/net/wireless/realtek/rtlwifi/usb.c
index a8eebafb9a7ee2b5a7b813c537c9a3a3384ec2b5..ab675703eaf507fe780ba5798367b30d6febb6fc 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/usb.c
+++ b/drivers/net/wireless/realtek/rtlwifi/usb.c
@@ -433,7 +433,7 @@ static void _rtl_usb_rx_process_agg(struct ieee80211_hw *hw,
        skb_pull(skb, RTL_RX_DESC_SIZE);
        rtlpriv->cfg->ops->query_rx_desc(hw, &stats, &rx_status, rxdesc, skb);
        skb_pull(skb, (stats.rx_drvinfo_size + stats.rx_bufshift));
-       hdr = (struct ieee80211_hdr *)(skb->data);
+       hdr = rtl_get_hdr(skb);
        fc = hdr->frame_control;
        if (!stats.crc) {
                memcpy(IEEE80211_SKB_RXCB(skb), &rx_status, sizeof(rx_status));
@@ -475,7 +475,7 @@ static void _rtl_usb_rx_process_noagg(struct ieee80211_hw *hw,
        skb_pull(skb, RTL_RX_DESC_SIZE);
        rtlpriv->cfg->ops->query_rx_desc(hw, &stats, &rx_status, rxdesc, skb);
        skb_pull(skb, (stats.rx_drvinfo_size + stats.rx_bufshift));
-       hdr = (struct ieee80211_hdr *)(skb->data);
+       hdr = rtl_get_hdr(skb);
        fc = hdr->frame_control;
        if (!stats.crc) {
                memcpy(IEEE80211_SKB_RXCB(skb), &rx_status, sizeof(rx_status));
@@ -926,7 +926,7 @@ static void _rtl_usb_tx_preprocess(struct ieee80211_hw *hw,
        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
        struct rtl_tx_desc *pdesc = NULL;
        struct rtl_tcb_desc tcb_desc;
-       struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data);
+       struct ieee80211_hdr *hdr = rtl_get_hdr(skb);
        __le16 fc = hdr->frame_control;
        u8 *pda_addr = hdr->addr1;
 
@@ -961,7 +961,7 @@ static int rtl_usb_tx(struct ieee80211_hw *hw,
 {
        struct rtl_usb *rtlusb = rtl_usbdev(rtl_usbpriv(hw));
        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-       struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data);
+       struct ieee80211_hdr *hdr = rtl_get_hdr(skb);
        __le16 fc = hdr->frame_control;
        u16 hw_queue;