diff options
Diffstat (limited to 'drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c')
-rw-r--r-- | drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 76 |
1 files changed, 32 insertions, 44 deletions
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c index 5147f7c01e31..0e762e559675 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Original code based Host AP (software wireless LAN access point) driver * for Intersil Prism2/2.5/3 - hostap.o module, common routines @@ -6,11 +7,6 @@ * <jkmaline@cc.hut.fi> * Copyright (c) 2002-2003, Jouni Malinen <jkmaline@cc.hut.fi> * Copyright (c) 2004, Intel Corporation - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. See README and COPYING for - * more details. ****************************************************************************** Few modifications for Realtek's Wi-Fi drivers by @@ -151,7 +147,7 @@ ieee80211_frag_cache_get(struct ieee80211_device *ieee, * should have already been received */ entry = ieee80211_frag_cache_find(ieee, seq, frag, tid,hdr->addr2, hdr->addr1); - if (entry != NULL) { + if (entry) { entry->last_frag = frag; skb = entry->skb; } @@ -190,7 +186,7 @@ static int ieee80211_frag_cache_invalidate(struct ieee80211_device *ieee, entry = ieee80211_frag_cache_find(ieee, seq, -1, tid, hdr->addr2, hdr->addr1); - if (entry == NULL) { + if (!entry) { IEEE80211_DEBUG_FRAG( "could not invalidate fragment cache " "entry (seq=%u)\n", seq); @@ -341,7 +337,7 @@ ieee80211_rx_frame_decrypt(struct ieee80211_device *ieee, struct sk_buff *skb, struct rtl_80211_hdr_4addr *hdr; int res, hdrlen; - if (crypt == NULL || crypt->ops->decrypt_mpdu == NULL) + if (!crypt || !crypt->ops->decrypt_mpdu) return 0; if (ieee->hwsec_active) { @@ -388,7 +384,7 @@ ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device *ieee, struct sk_buff *s struct rtl_80211_hdr_4addr *hdr; int res, hdrlen; - if (crypt == NULL || crypt->ops->decrypt_msdu == NULL) + if (!crypt || !crypt->ops->decrypt_msdu) return 0; if (ieee->hwsec_active) { @@ -508,23 +504,17 @@ drop: return 1; } -static bool AddReorderEntry(struct rx_ts_record *pTS, PRX_REORDER_ENTRY pReorderEntry) +static bool AddReorderEntry(struct rx_ts_record *pTS, struct rx_reorder_entry *pReorderEntry) { struct list_head *pList = &pTS->rx_pending_pkt_list; while(pList->next != &pTS->rx_pending_pkt_list) { - if( SN_LESS(pReorderEntry->SeqNum, ((PRX_REORDER_ENTRY)list_entry(pList->next,RX_REORDER_ENTRY,List))->SeqNum) ) - { + if (SN_LESS(pReorderEntry->SeqNum, list_entry(pList->next, struct rx_reorder_entry, List)->SeqNum)) pList = pList->next; - } - else if( SN_EQUAL(pReorderEntry->SeqNum, ((PRX_REORDER_ENTRY)list_entry(pList->next,RX_REORDER_ENTRY,List))->SeqNum) ) - { + else if (SN_EQUAL(pReorderEntry->SeqNum, list_entry(pList->next, struct rx_reorder_entry, List)->SeqNum)) return false; - } else - { break; - } } pReorderEntry->List.next = pList->next; pReorderEntry->List.next->prev = &pReorderEntry->List; @@ -589,7 +579,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee, struct rx_ts_record *pTS, u16 SeqNum) { PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; - PRX_REORDER_ENTRY pReorderEntry = NULL; + struct rx_reorder_entry *pReorderEntry = NULL; struct ieee80211_rxb **prxbIndicateArray; u8 WinSize = pHTInfo->RxReorderWinSize; u16 WinEnd = (pTS->rx_indicate_seq + WinSize - 1) % 4096; @@ -604,9 +594,8 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee, return; /* Rx Reorder initialize condition.*/ - if (pTS->rx_indicate_seq == 0xffff) { + if (pTS->rx_indicate_seq == 0xffff) pTS->rx_indicate_seq = SeqNum; - } /* Drop out the packet which SeqNum is smaller than WinStart */ if (SN_LESS(SeqNum, pTS->rx_indicate_seq)) { @@ -663,7 +652,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee, /* Current packet is going to be inserted into pending list.*/ //IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): We RX no ordered packed, insert to ordered list\n",__func__); if(!list_empty(&ieee->RxReorder_Unused_List)) { - pReorderEntry = (PRX_REORDER_ENTRY)list_entry(ieee->RxReorder_Unused_List.next,RX_REORDER_ENTRY,List); + pReorderEntry = list_entry(ieee->RxReorder_Unused_List.next, struct rx_reorder_entry, List); list_del_init(&pReorderEntry->List); /* Make a reorder entry and insert into a the packet list.*/ @@ -709,7 +698,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee, /* Check if there is any packet need indicate.*/ while(!list_empty(&pTS->rx_pending_pkt_list)) { IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): start RREORDER indicate\n",__func__); - pReorderEntry = (PRX_REORDER_ENTRY)list_entry(pTS->rx_pending_pkt_list.prev,RX_REORDER_ENTRY,List); + pReorderEntry = list_entry(pTS->rx_pending_pkt_list.prev, struct rx_reorder_entry, List); if (SN_LESS(pReorderEntry->SeqNum, pTS->rx_indicate_seq) || SN_EQUAL(pReorderEntry->SeqNum, pTS->rx_indicate_seq)) { @@ -989,8 +978,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, /* allow NULL decrypt to indicate an station specific override * for default encryption */ - if (crypt && (crypt->ops == NULL || - crypt->ops->decrypt_mpdu == NULL)) + if (crypt && (!crypt->ops || !crypt->ops->decrypt_mpdu)) crypt = NULL; if (!crypt && (fc & IEEE80211_FCTL_WEP)) { @@ -1291,7 +1279,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, } //added by amy for reorder - if (!ieee->pHTInfo->bCurRxReorderEnable || pTS == NULL){ + if (!ieee->pHTInfo->bCurRxReorderEnable || !pTS) { //added by amy for reorder for(i = 0; i<rxb->nr_subframes; i++) { struct sk_buff *sub_skb = rxb->subframes[i]; @@ -1427,9 +1415,9 @@ static int ieee80211_read_qos_info_element(struct int ret = 0; u16 size = sizeof(struct ieee80211_qos_information_element) - 2; - if (element_info == NULL) + if (!element_info) return -1; - if (info_element == NULL) + if (!info_element) return -1; if ((info_element->id == QOS_ELEMENT_ID) && (info_element->len == size)) { @@ -2405,22 +2393,22 @@ static inline void ieee80211_process_probe_response( "'%s' (%pM): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n", escape_essid(info_element->data, info_element->len), beacon->header.addr3, - (capability & (1 << 0xf)) ? '1' : '0', - (capability & (1 << 0xe)) ? '1' : '0', - (capability & (1 << 0xd)) ? '1' : '0', - (capability & (1 << 0xc)) ? '1' : '0', - (capability & (1 << 0xb)) ? '1' : '0', - (capability & (1 << 0xa)) ? '1' : '0', - (capability & (1 << 0x9)) ? '1' : '0', - (capability & (1 << 0x8)) ? '1' : '0', - (capability & (1 << 0x7)) ? '1' : '0', - (capability & (1 << 0x6)) ? '1' : '0', - (capability & (1 << 0x5)) ? '1' : '0', - (capability & (1 << 0x4)) ? '1' : '0', - (capability & (1 << 0x3)) ? '1' : '0', - (capability & (1 << 0x2)) ? '1' : '0', - (capability & (1 << 0x1)) ? '1' : '0', - (capability & (1 << 0x0)) ? '1' : '0'); + (capability & BIT(0xf)) ? '1' : '0', + (capability & BIT(0xe)) ? '1' : '0', + (capability & BIT(0xd)) ? '1' : '0', + (capability & BIT(0xc)) ? '1' : '0', + (capability & BIT(0xb)) ? '1' : '0', + (capability & BIT(0xa)) ? '1' : '0', + (capability & BIT(0x9)) ? '1' : '0', + (capability & BIT(0x8)) ? '1' : '0', + (capability & BIT(0x7)) ? '1' : '0', + (capability & BIT(0x6)) ? '1' : '0', + (capability & BIT(0x5)) ? '1' : '0', + (capability & BIT(0x4)) ? '1' : '0', + (capability & BIT(0x3)) ? '1' : '0', + (capability & BIT(0x2)) ? '1' : '0', + (capability & BIT(0x1)) ? '1' : '0', + (capability & BIT(0x0)) ? '1' : '0'); if (ieee80211_network_init(ieee, beacon, network, stats)) { IEEE80211_DEBUG_SCAN("Dropped '%s' (%pM) via %s.\n", |