From: Martin Kaiser Date: Sun, 27 Feb 2022 16:41:44 +0000 (+0100) Subject: staging: r8188eu: use ieee80211 helper to check for more fragments X-Git-Tag: howlett/maple/20220722_2~883^2~75 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7c22fd48fd4e9a89a8400828e77f169a604cfa3b;p=users%2Fjedix%2Flinux-maple.git staging: r8188eu: use ieee80211 helper to check for more fragments Use the ieee80211 helper to check the "more fragments" bit. Remove the internal GetMFrag macro. Signed-off-by: Martin Kaiser Link: https://lore.kernel.org/r/20220227164147.1168847-6-martin@kaiser.cx Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r8188eu/core/rtw_recv.c index 3a92d261f7c38..e8da2e5bbc321 100644 --- a/drivers/staging/r8188eu/core/rtw_recv.c +++ b/drivers/staging/r8188eu/core/rtw_recv.c @@ -1081,7 +1081,7 @@ static int validate_recv_frame(struct adapter *adapter, struct recv_frame *precv pattrib->seq_num = GetSequence(ptr); pattrib->pw_save = GetPwrMgt(ptr); - pattrib->mfrag = GetMFrag(ptr); + pattrib->mfrag = ieee80211_has_morefrags(fc); pattrib->mdata = GetMData(ptr); pattrib->privacy = GetPrivacy(ptr); pattrib->order = GetOrder(ptr); diff --git a/drivers/staging/r8188eu/include/wifi.h b/drivers/staging/r8188eu/include/wifi.h index 5b383c2e98805..1d703bc94fca3 100644 --- a/drivers/staging/r8188eu/include/wifi.h +++ b/drivers/staging/r8188eu/include/wifi.h @@ -183,8 +183,6 @@ enum WIFI_REG_DOMAIN { #define SetMFrag(pbuf) \ *(__le16 *)(pbuf) |= cpu_to_le16(_MORE_FRAG_) -#define GetMFrag(pbuf) (((*(__le16 *)(pbuf)) & cpu_to_le16(_MORE_FRAG_)) != 0) - #define ClearMFrag(pbuf) \ *(__le16 *)(pbuf) &= (~cpu_to_le16(_MORE_FRAG_))