Commit c1ea345d authored by Ping-Ke Shih's avatar Ping-Ke Shih Committed by Kalle Valo
Browse files

rtw89: encapsulate RX handlers to single function 



We have three points to receive packets to mac80211 with three different
kinds of status. Many handlers are common and can be shared, so I move
them together, and I don't change the logic at all.

Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220103013623.17052-3-pkshih@realtek.com
parent e56f3420

drivers/net/wireless/realtek/rtw89/core.c

+17 −15
Original line number Diff line number Diff line
@@ -1087,6 +1087,18 @@ static void rtw89_core_hw_to_sband_rate(struct ieee80211_rx_status *rx_status) 
	rx_status->rate_idx -= 4;

}



static void rtw89_core_rx_to_mac80211(struct rtw89_dev *rtwdev,

				      struct rtw89_rx_phy_ppdu *phy_ppdu,

				      struct rtw89_rx_desc_info *desc_info,

				      struct sk_buff *skb_ppdu,

				      struct ieee80211_rx_status *rx_status)

{

	rtw89_core_hw_to_sband_rate(rx_status);

	rtw89_core_rx_stats(rtwdev, phy_ppdu, desc_info, skb_ppdu);

	ieee80211_rx_napi(rtwdev->hw, NULL, skb_ppdu, &rtwdev->napi);

	rtwdev->napi_budget_countdown--;

}



static void rtw89_core_rx_pending_skb(struct rtw89_dev *rtwdev,

				      struct rtw89_rx_phy_ppdu *phy_ppdu,

				      struct rtw89_rx_desc_info *desc_info,
@@ -1106,10 +1118,7 @@ static void rtw89_core_rx_pending_skb(struct rtw89_dev *rtwdev, 
		if (rtw89_core_rx_ppdu_match(rtwdev, desc_info, rx_status))

			rtw89_chip_query_ppdu(rtwdev, phy_ppdu, rx_status);

		rtw89_correct_cck_chan(rtwdev, rx_status);

		rtw89_core_hw_to_sband_rate(rx_status);

		rtw89_core_rx_stats(rtwdev, phy_ppdu, desc_info, skb_ppdu);

		ieee80211_rx_napi(rtwdev->hw, NULL, skb_ppdu, &rtwdev->napi);

		rtwdev->napi_budget_countdown--;

		rtw89_core_rx_to_mac80211(rtwdev, phy_ppdu, desc_info, skb_ppdu, rx_status);

	}

}
@@ -1334,10 +1343,7 @@ static void rtw89_core_flush_ppdu_rx_queue(struct rtw89_dev *rtwdev, 
	skb_queue_walk_safe(&ppdu_sts->rx_queue[band], skb_ppdu, tmp) {

		skb_unlink(skb_ppdu, &ppdu_sts->rx_queue[band]);

		rx_status = IEEE80211_SKB_RXCB(skb_ppdu);

		rtw89_core_hw_to_sband_rate(rx_status);

		rtw89_core_rx_stats(rtwdev, NULL, desc_info, skb_ppdu);

		ieee80211_rx_napi(rtwdev->hw, NULL, skb_ppdu, &rtwdev->napi);

		rtwdev->napi_budget_countdown--;

		rtw89_core_rx_to_mac80211(rtwdev, NULL, desc_info, skb_ppdu, rx_status);

	}

}
@@ -1364,14 +1370,10 @@ void rtw89_core_rx(struct rtw89_dev *rtwdev, 
	memset(rx_status, 0, sizeof(*rx_status));

	rtw89_core_update_rx_status(rtwdev, desc_info, rx_status);

	if (desc_info->long_rxdesc &&

	    BIT(desc_info->frame_type) & PPDU_FILTER_BITMAP) {

	    BIT(desc_info->frame_type) & PPDU_FILTER_BITMAP)

		skb_queue_tail(&ppdu_sts->rx_queue[band], skb);

	} else {

		rtw89_core_hw_to_sband_rate(rx_status);

		rtw89_core_rx_stats(rtwdev, NULL, desc_info, skb);

		ieee80211_rx_napi(rtwdev->hw, NULL, skb, &rtwdev->napi);

		rtwdev->napi_budget_countdown--;

	}

	else

		rtw89_core_rx_to_mac80211(rtwdev, NULL, desc_info, skb, rx_status);

}

EXPORT_SYMBOL(rtw89_core_rx);