From: Martin Kaiser Date: Sun, 27 Feb 2022 16:41:47 +0000 (+0100) Subject: staging: r8188eu: use ieee80211 helper to read the "order" bit X-Git-Tag: howlett/maple/20220722_2~883^2~72 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=095f746502740d76a086ab127e11b3c4dba78141;p=users%2Fjedix%2Flinux-maple.git staging: r8188eu: use ieee80211 helper to read the "order" bit Use the ieee80211 helper to read the "order" bit. The driver-specific macro GetOrder can be removed. Signed-off-by: Martin Kaiser Link: https://lore.kernel.org/r/20220227164147.1168847-9-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 b245b0d54973d..d77d983510a08 100644 --- a/drivers/staging/r8188eu/core/rtw_recv.c +++ b/drivers/staging/r8188eu/core/rtw_recv.c @@ -1084,7 +1084,7 @@ static int validate_recv_frame(struct adapter *adapter, struct recv_frame *precv pattrib->mfrag = ieee80211_has_morefrags(fc); pattrib->mdata = ieee80211_has_moredata(fc); pattrib->privacy = ieee80211_has_protected(fc); - pattrib->order = GetOrder(ptr); + pattrib->order = ieee80211_has_order(fc); /* Dump rx packets */ GetHalDefVar8188EUsb(adapter, HAL_DEF_DBG_DUMP_RXPKT, &bDumpRxPkt); diff --git a/drivers/staging/r8188eu/include/wifi.h b/drivers/staging/r8188eu/include/wifi.h index 336c32470150a..39b7a596e4c1d 100644 --- a/drivers/staging/r8188eu/include/wifi.h +++ b/drivers/staging/r8188eu/include/wifi.h @@ -217,9 +217,6 @@ enum WIFI_REG_DOMAIN { #define ClearPrivacy(pbuf) \ *(__le16 *)(pbuf) &= (~cpu_to_le16(_PRIVACY_)) -#define GetOrder(pbuf) \ - (((*(__le16 *)(pbuf)) & cpu_to_le16(_ORDER_)) != 0) - #define GetFrameType(pbuf) \ (le16_to_cpu(*(__le16 *)(pbuf)) & (BIT(3) | BIT(2)))