Skip to content

L
linux
Commit db8971b6 authored by Larry Finger's avatar Larry Finger Committed by Greg Kroah-Hartman
Browse files
Options

staging: rtl8192e: Cleanup checkpatch -f errors - Part XIII 

With this patch, all of the checkpatch errors are fixed; however, only
some of the lines that are too long were fixed. To complete the fixing
of these warnings, the file rtl_dm.c will need refactoring. In addition,
some of the variables will need renaming. Those changes can be deferred.
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8567829a
Show whitespace changes
Inline Side-by-side
Showing with 730 additions and 794 deletions
drivers/staging/rtl8192e/rtllib_module.c
View file @ db8971b6
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
#define DRV_NAME "rtllib_92e" #define DRV_NAME "rtllib_92e"
void _setup_timer(struct timer_list* ptimer, void *fun, unsigned long data) void _setup_timer(struct timer_list *ptimer, void *fun, unsigned long data)
{ {
ptimer->function = fun; ptimer->function = fun;
ptimer->data = data; ptimer->data = data;
......
drivers/staging/rtl8192e/rtllib_rx.c
View file @ db8971b6
...@@ -39,14 +39,14 @@ ...@@ -39,14 +39,14 @@
#include <linux/version.h> #include <linux/version.h>
#include <linux/wireless.h> #include <linux/wireless.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <asm/uaccess.h> #include <linux/uaccess.h>
#include <linux/ctype.h> #include <linux/ctype.h>
#include "rtllib.h" #include "rtllib.h"
#include "dot11d.h" #include "dot11d.h"
static inline void rtllib_monitor_rx(struct rtllib_device *ieee, static inline void rtllib_monitor_rx(struct rtllib_device *ieee,
struct sk_buff *skb,struct rtllib_rx_stats *rx_status, struct sk_buff *skb, struct rtllib_rx_stats *rx_status,
size_t hdr_length) size_t hdr_length)
{ {
skb->dev = ieee->dev; skb->dev = ieee->dev;
...@@ -61,7 +61,7 @@ static inline void rtllib_monitor_rx(struct rtllib_device *ieee, ...@@ -61,7 +61,7 @@ static inline void rtllib_monitor_rx(struct rtllib_device *ieee,
/* Called only as a tasklet (software IRQ) */ /* Called only as a tasklet (software IRQ) */
static struct rtllib_frag_entry * static struct rtllib_frag_entry *
rtllib_frag_cache_find(struct rtllib_device *ieee, unsigned int seq, rtllib_frag_cache_find(struct rtllib_device *ieee, unsigned int seq,
unsigned int frag, u8 tid,u8 *src, u8 *dst) unsigned int frag, u8 tid, u8 *src, u8 *dst)
{ {
struct rtllib_frag_entry *entry; struct rtllib_frag_entry *entry;
int i; int i;
...@@ -103,16 +103,16 @@ rtllib_frag_cache_get(struct rtllib_device *ieee, ...@@ -103,16 +103,16 @@ rtllib_frag_cache_get(struct rtllib_device *ieee,
struct rtllib_hdr_4addrqos *hdr_4addrqos; struct rtllib_hdr_4addrqos *hdr_4addrqos;
u8 tid; u8 tid;
if (((fc & RTLLIB_FCTL_DSTODS) == RTLLIB_FCTL_DSTODS)&&RTLLIB_QOS_HAS_SEQ(fc)) { if (((fc & RTLLIB_FCTL_DSTODS) == RTLLIB_FCTL_DSTODS) && RTLLIB_QOS_HAS_SEQ(fc)) {
hdr_4addrqos = (struct rtllib_hdr_4addrqos *)hdr; hdr_4addrqos = (struct rtllib_hdr_4addrqos *)hdr;
tid = le16_to_cpu(hdr_4addrqos->qos_ctl) & RTLLIB_QCTL_TID; tid = le16_to_cpu(hdr_4addrqos->qos_ctl) & RTLLIB_QCTL_TID;
tid = UP2AC(tid); tid = UP2AC(tid);
tid ++; tid++;
} else if (RTLLIB_QOS_HAS_SEQ(fc)) { } else if (RTLLIB_QOS_HAS_SEQ(fc)) {
hdr_3addrqos = (struct rtllib_hdr_3addrqos *)hdr; hdr_3addrqos = (struct rtllib_hdr_3addrqos *)hdr;
tid = le16_to_cpu(hdr_3addrqos->qos_ctl) & RTLLIB_QCTL_TID; tid = le16_to_cpu(hdr_3addrqos->qos_ctl) & RTLLIB_QCTL_TID;
tid = UP2AC(tid); tid = UP2AC(tid);
tid ++; tid++;
} else { } else {
tid = 0; tid = 0;
} }
...@@ -125,7 +125,7 @@ rtllib_frag_cache_get(struct rtllib_device *ieee, ...@@ -125,7 +125,7 @@ rtllib_frag_cache_get(struct rtllib_device *ieee,
2 /* alignment */ + 2 /* alignment */ +
8 /* WEP */ + 8 /* WEP */ +
ETH_ALEN /* WDS */ + ETH_ALEN /* WDS */ +
(RTLLIB_QOS_HAS_SEQ(fc)?2:0) /* QOS Control */); (RTLLIB_QOS_HAS_SEQ(fc) ? 2 : 0) /* QOS Control */);
if (skb == NULL) if (skb == NULL)
return NULL; return NULL;
...@@ -146,7 +146,7 @@ rtllib_frag_cache_get(struct rtllib_device *ieee, ...@@ -146,7 +146,7 @@ rtllib_frag_cache_get(struct rtllib_device *ieee,
} else { } else {
/* received a fragment of a frame for which the head fragment /* received a fragment of a frame for which the head fragment
* should have already been received */ * should have already been received */
entry = rtllib_frag_cache_find(ieee, seq, frag, tid,hdr->addr2, entry = rtllib_frag_cache_find(ieee, seq, frag, tid, hdr->addr2,
hdr->addr1); hdr->addr1);
if (entry != NULL) { if (entry != NULL) {
entry->last_frag = frag; entry->last_frag = frag;
...@@ -170,21 +170,21 @@ static int rtllib_frag_cache_invalidate(struct rtllib_device *ieee, ...@@ -170,21 +170,21 @@ static int rtllib_frag_cache_invalidate(struct rtllib_device *ieee,
struct rtllib_hdr_4addrqos *hdr_4addrqos; struct rtllib_hdr_4addrqos *hdr_4addrqos;
u8 tid; u8 tid;
if (((fc & RTLLIB_FCTL_DSTODS) == RTLLIB_FCTL_DSTODS)&&RTLLIB_QOS_HAS_SEQ(fc)) { if (((fc & RTLLIB_FCTL_DSTODS) == RTLLIB_FCTL_DSTODS) && RTLLIB_QOS_HAS_SEQ(fc)) {
hdr_4addrqos = (struct rtllib_hdr_4addrqos *)hdr; hdr_4addrqos = (struct rtllib_hdr_4addrqos *)hdr;
tid = le16_to_cpu(hdr_4addrqos->qos_ctl) & RTLLIB_QCTL_TID; tid = le16_to_cpu(hdr_4addrqos->qos_ctl) & RTLLIB_QCTL_TID;
tid = UP2AC(tid); tid = UP2AC(tid);
tid ++; tid++;
} else if (RTLLIB_QOS_HAS_SEQ(fc)) { } else if (RTLLIB_QOS_HAS_SEQ(fc)) {
hdr_3addrqos = (struct rtllib_hdr_3addrqos *)hdr; hdr_3addrqos = (struct rtllib_hdr_3addrqos *)hdr;
tid = le16_to_cpu(hdr_3addrqos->qos_ctl) & RTLLIB_QCTL_TID; tid = le16_to_cpu(hdr_3addrqos->qos_ctl) & RTLLIB_QCTL_TID;
tid = UP2AC(tid); tid = UP2AC(tid);
tid ++; tid++;
} else { } else {
tid = 0; tid = 0;
} }
entry = rtllib_frag_cache_find(ieee, seq, -1, tid,hdr->addr2, entry = rtllib_frag_cache_find(ieee, seq, -1, tid, hdr->addr2,
hdr->addr1); hdr->addr1);
if (entry == NULL) { if (entry == NULL) {
...@@ -198,8 +198,6 @@ static int rtllib_frag_cache_invalidate(struct rtllib_device *ieee, ...@@ -198,8 +198,6 @@ static int rtllib_frag_cache_invalidate(struct rtllib_device *ieee,
return 0; return 0;
} }
/* rtllib_rx_frame_mgtmt /* rtllib_rx_frame_mgtmt
* *
* Responsible for handling management control frames * Responsible for handling management control frames
...@@ -217,7 +215,7 @@ rtllib_rx_frame_mgmt(struct rtllib_device *ieee, struct sk_buff *skb, ...@@ -217,7 +215,7 @@ rtllib_rx_frame_mgmt(struct rtllib_device *ieee, struct sk_buff *skb,
struct rtllib_hdr_3addr * hdr = (struct rtllib_hdr_3addr *)skb->data; struct rtllib_hdr_3addr * hdr = (struct rtllib_hdr_3addr *)skb->data;
rx_stats->len = skb->len; rx_stats->len = skb->len;
rtllib_rx_mgt(ieee,skb,rx_stats); rtllib_rx_mgt(ieee, skb, rx_stats);
if ((memcmp(hdr->addr1, ieee->dev->dev_addr, ETH_ALEN))) { if ((memcmp(hdr->addr1, ieee->dev->dev_addr, ETH_ALEN))) {
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
return 0; return 0;
...@@ -231,11 +229,13 @@ rtllib_rx_frame_mgmt(struct rtllib_device *ieee, struct sk_buff *skb, ...@@ -231,11 +229,13 @@ rtllib_rx_frame_mgmt(struct rtllib_device *ieee, struct sk_buff *skb,
/* See IEEE 802.1H for LLC/SNAP encapsulation/decapsulation */ /* See IEEE 802.1H for LLC/SNAP encapsulation/decapsulation */
/* Ethernet-II snap header (RFC1042 for most EtherTypes) */ /* Ethernet-II snap header (RFC1042 for most EtherTypes) */
static unsigned char rfc1042_header[] = static unsigned char rfc1042_header[] = {
{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 }; 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00
};
/* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */ /* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */
static unsigned char bridge_tunnel_header[] = static unsigned char bridge_tunnel_header[] = {
{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 }; 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8
};
/* No encapsulation header if EtherType < 0x600 (=length) */ /* No encapsulation header if EtherType < 0x600 (=length) */
/* Called by rtllib_rx_frame_decrypt */ /* Called by rtllib_rx_frame_decrypt */
...@@ -280,7 +280,7 @@ static int rtllib_is_eapol_frame(struct rtllib_device *ieee, ...@@ -280,7 +280,7 @@ static int rtllib_is_eapol_frame(struct rtllib_device *ieee,
/* Called only as a tasklet (software IRQ), by rtllib_rx */ /* Called only as a tasklet (software IRQ), by rtllib_rx */
static inline int static inline int
rtllib_rx_frame_decrypt(struct rtllib_device* ieee, struct sk_buff *skb, rtllib_rx_frame_decrypt(struct rtllib_device *ieee, struct sk_buff *skb,
struct rtllib_crypt_data *crypt) struct rtllib_crypt_data *crypt)
{ {
struct rtllib_hdr_4addr *hdr; struct rtllib_hdr_4addr *hdr;
...@@ -289,9 +289,8 @@ rtllib_rx_frame_decrypt(struct rtllib_device* ieee, struct sk_buff *skb, ...@@ -289,9 +289,8 @@ rtllib_rx_frame_decrypt(struct rtllib_device* ieee, struct sk_buff *skb,
if (crypt == NULL || crypt->ops->decrypt_mpdu == NULL) if (crypt == NULL || crypt->ops->decrypt_mpdu == NULL)
return 0; return 0;
if (ieee->hwsec_active) if (ieee->hwsec_active) {
{ struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb+ MAX_DEV_ADDR_SIZE);
tcb_desc->bHwSec = 1; tcb_desc->bHwSec = 1;
if (ieee->need_sw_enc) if (ieee->need_sw_enc)
...@@ -322,7 +321,7 @@ rtllib_rx_frame_decrypt(struct rtllib_device* ieee, struct sk_buff *skb, ...@@ -322,7 +321,7 @@ rtllib_rx_frame_decrypt(struct rtllib_device* ieee, struct sk_buff *skb,
/* Called only as a tasklet (software IRQ), by rtllib_rx */ /* Called only as a tasklet (software IRQ), by rtllib_rx */
static inline int static inline int
rtllib_rx_frame_decrypt_msdu(struct rtllib_device* ieee, struct sk_buff *skb, rtllib_rx_frame_decrypt_msdu(struct rtllib_device *ieee, struct sk_buff *skb,
int keyidx, struct rtllib_crypt_data *crypt) int keyidx, struct rtllib_crypt_data *crypt)
{ {
struct rtllib_hdr_4addr *hdr; struct rtllib_hdr_4addr *hdr;
...@@ -330,9 +329,8 @@ rtllib_rx_frame_decrypt_msdu(struct rtllib_device* ieee, struct sk_buff *skb, ...@@ -330,9 +329,8 @@ rtllib_rx_frame_decrypt_msdu(struct rtllib_device* ieee, struct sk_buff *skb,
if (crypt == NULL || crypt->ops->decrypt_msdu == NULL) if (crypt == NULL || crypt->ops->decrypt_msdu == NULL)
return 0; return 0;
if (ieee->hwsec_active) if (ieee->hwsec_active) {
{ struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb+ MAX_DEV_ADDR_SIZE);
tcb_desc->bHwSec = 1; tcb_desc->bHwSec = 1;
if (ieee->need_sw_enc) if (ieee->need_sw_enc)
...@@ -343,7 +341,7 @@ rtllib_rx_frame_decrypt_msdu(struct rtllib_device* ieee, struct sk_buff *skb, ...@@ -343,7 +341,7 @@ rtllib_rx_frame_decrypt_msdu(struct rtllib_device* ieee, struct sk_buff *skb,
hdrlen = rtllib_get_hdrlen(le16_to_cpu(hdr->frame_ctl)); hdrlen = rtllib_get_hdrlen(le16_to_cpu(hdr->frame_ctl));
atomic_inc(&crypt->refcnt); atomic_inc(&crypt->refcnt);
res = crypt->ops->decrypt_msdu(skb, keyidx, hdrlen, crypt->priv,ieee); res = crypt->ops->decrypt_msdu(skb, keyidx, hdrlen, crypt->priv, ieee);
atomic_dec(&crypt->refcnt); atomic_dec(&crypt->refcnt);
if (res < 0) { if (res < 0) {
printk(KERN_DEBUG "%s: MSDU decryption/MIC verification failed" printk(KERN_DEBUG "%s: MSDU decryption/MIC verification failed"
...@@ -371,16 +369,16 @@ static int is_duplicate_packet(struct rtllib_device *ieee, ...@@ -371,16 +369,16 @@ static int is_duplicate_packet(struct rtllib_device *ieee,
struct rtllib_hdr_4addrqos *hdr_4addrqos; struct rtllib_hdr_4addrqos *hdr_4addrqos;
u8 tid; u8 tid;
if (((fc & RTLLIB_FCTL_DSTODS) == RTLLIB_FCTL_DSTODS)&&RTLLIB_QOS_HAS_SEQ(fc)) { if (((fc & RTLLIB_FCTL_DSTODS) == RTLLIB_FCTL_DSTODS) && RTLLIB_QOS_HAS_SEQ(fc)) {
hdr_4addrqos = (struct rtllib_hdr_4addrqos *)header; hdr_4addrqos = (struct rtllib_hdr_4addrqos *)header;
tid = le16_to_cpu(hdr_4addrqos->qos_ctl) & RTLLIB_QCTL_TID; tid = le16_to_cpu(hdr_4addrqos->qos_ctl) & RTLLIB_QCTL_TID;
tid = UP2AC(tid); tid = UP2AC(tid);
tid ++; tid++;
} else if (RTLLIB_QOS_HAS_SEQ(fc)) { } else if (RTLLIB_QOS_HAS_SEQ(fc)) {
hdr_3addrqos = (struct rtllib_hdr_3addrqos*)header; hdr_3addrqos = (struct rtllib_hdr_3addrqos *)header;
tid = le16_to_cpu(hdr_3addrqos->qos_ctl) & RTLLIB_QCTL_TID; tid = le16_to_cpu(hdr_3addrqos->qos_ctl) & RTLLIB_QCTL_TID;
tid = UP2AC(tid); tid = UP2AC(tid);
tid ++; tid++;
} else { } else {
tid = 0; tid = 0;
} }
...@@ -427,10 +425,8 @@ static int is_duplicate_packet(struct rtllib_device *ieee, ...@@ -427,10 +425,8 @@ static int is_duplicate_packet(struct rtllib_device *ieee,
if ((*last_seq == seq) && if ((*last_seq == seq) &&
time_after(*last_time + IEEE_PACKET_RETRY_TIME, jiffies)) { time_after(*last_time + IEEE_PACKET_RETRY_TIME, jiffies)) {
if (*last_frag == frag){ if (*last_frag == frag)
goto drop; goto drop;
}
if (*last_frag + 1 != frag) if (*last_frag + 1 != frag)
/* out-of-order fragment */ /* out-of-order fragment */
goto drop; goto drop;
...@@ -445,29 +441,19 @@ static int is_duplicate_packet(struct rtllib_device *ieee, ...@@ -445,29 +441,19 @@ static int is_duplicate_packet(struct rtllib_device *ieee,
return 1; return 1;
} }
bool
AddReorderEntry( bool AddReorderEntry(struct rx_ts_record *pTS, struct rx_reorder_entry *pReorderEntry)
struct rx_ts_record *pTS,
struct rx_reorder_entry *pReorderEntry
)
{ {
struct list_head *pList = &pTS->RxPendingPktList; struct list_head *pList = &pTS->RxPendingPktList;
while(pList->next != &pTS->RxPendingPktList) while (pList->next != &pTS->RxPendingPktList) {
{ if (SN_LESS(pReorderEntry->SeqNum, ((struct rx_reorder_entry *)list_entry(pList->next, struct rx_reorder_entry, List))->SeqNum))
if ( SN_LESS(pReorderEntry->SeqNum, ((struct rx_reorder_entry *)list_entry(pList->next,struct rx_reorder_entry,List))->SeqNum) )
{
pList = pList->next; pList = pList->next;
} else if (SN_EQUAL(pReorderEntry->SeqNum, ((struct rx_reorder_entry *)list_entry(pList->next, struct rx_reorder_entry, List))->SeqNum))
else if ( SN_EQUAL(pReorderEntry->SeqNum, ((struct rx_reorder_entry *)list_entry(pList->next,struct rx_reorder_entry,List))->SeqNum) )
{
return false; return false;
}
else else
{
break; break;
} }
}
pReorderEntry->List.next = pList->next; pReorderEntry->List.next = pList->next;
pReorderEntry->List.next->prev = &pReorderEntry->List; pReorderEntry->List.next->prev = &pReorderEntry->List;
pReorderEntry->List.prev = pList; pReorderEntry->List.prev = pList;
...@@ -476,14 +462,14 @@ AddReorderEntry( ...@@ -476,14 +462,14 @@ AddReorderEntry(
return true; return true;
} }
void rtllib_indicate_packets(struct rtllib_device *ieee, struct rtllib_rxb** prxbIndicateArray,u8 index) void rtllib_indicate_packets(struct rtllib_device *ieee, struct rtllib_rxb **prxbIndicateArray, u8 index)
{ {
struct net_device_stats *stats = &ieee->stats; struct net_device_stats *stats = &ieee->stats;
u8 i = 0 , j=0; u8 i = 0 , j = 0;
u16 ethertype; u16 ethertype;
for (j = 0; j < index; j++) { for (j = 0; j < index; j++) {
struct rtllib_rxb* prxb = prxbIndicateArray[j]; struct rtllib_rxb *prxb = prxbIndicateArray[j];
for (i = 0; i<prxb->nr_subframes; i++) { for (i = 0; i < prxb->nr_subframes; i++) {
struct sk_buff *sub_skb = prxb->subframes[i]; struct sk_buff *sub_skb = prxb->subframes[i];
/* convert hdr + possible LLC headers into Ethernet header */ /* convert hdr + possible LLC headers into Ethernet header */
...@@ -492,8 +478,8 @@ void rtllib_indicate_packets(struct rtllib_device *ieee, struct rtllib_rxb** prx ...@@ -492,8 +478,8 @@ void rtllib_indicate_packets(struct rtllib_device *ieee, struct rtllib_rxb** prx
((memcmp(sub_skb->data, rfc1042_header, SNAP_SIZE) == 0 && ((memcmp(sub_skb->data, rfc1042_header, SNAP_SIZE) == 0 &&
ethertype != ETH_P_AARP && ethertype != ETH_P_IPX) || ethertype != ETH_P_AARP && ethertype != ETH_P_IPX) ||
memcmp(sub_skb->data, bridge_tunnel_header, SNAP_SIZE) == 0)) { memcmp(sub_skb->data, bridge_tunnel_header, SNAP_SIZE) == 0)) {
/* remove RFC1042 or Bridge-Tunnel encapsulation and /* remove RFC1042 or Bridge-Tunnel encapsulation
* replace EtherType */ * and replace EtherType */
skb_pull(sub_skb, SNAP_SIZE); skb_pull(sub_skb, SNAP_SIZE);
memcpy(skb_push(sub_skb, ETH_ALEN), prxb->src, ETH_ALEN); memcpy(skb_push(sub_skb, ETH_ALEN), prxb->src, ETH_ALEN);
memcpy(skb_push(sub_skb, ETH_ALEN), prxb->dst, ETH_ALEN); memcpy(skb_push(sub_skb, ETH_ALEN), prxb->dst, ETH_ALEN);
...@@ -526,24 +512,21 @@ void rtllib_indicate_packets(struct rtllib_device *ieee, struct rtllib_rxb** prx ...@@ -526,24 +512,21 @@ void rtllib_indicate_packets(struct rtllib_device *ieee, struct rtllib_rxb** prx
} }
} }
void void rtllib_FlushRxTsPendingPkts(struct rtllib_device *ieee, struct rx_ts_record *pTS)
rtllib_FlushRxTsPendingPkts(struct rtllib_device *ieee, struct rx_ts_record *pTS)
{ {
struct rx_reorder_entry *pRxReorderEntry; struct rx_reorder_entry *pRxReorderEntry;
struct rtllib_rxb* RfdArray[REORDER_WIN_SIZE]; struct rtllib_rxb *RfdArray[REORDER_WIN_SIZE];
u8 RfdCnt = 0; u8 RfdCnt = 0;
del_timer_sync(&pTS->RxPktPendingTimer); del_timer_sync(&pTS->RxPktPendingTimer);
while(!list_empty(&pTS->RxPendingPktList)) while (!list_empty(&pTS->RxPendingPktList)) {
{ if (RfdCnt >= REORDER_WIN_SIZE) {
if (RfdCnt >= REORDER_WIN_SIZE){ printk(KERN_INFO "-------------->%s() error! RfdCnt >= REORDER_WIN_SIZE\n", __func__);
printk("-------------->%s() error! RfdCnt >= REORDER_WIN_SIZE\n", __func__);
break; break;
} }
pRxReorderEntry = (struct rx_reorder_entry *)list_entry(pTS->RxPendingPktList.prev,struct rx_reorder_entry,List); pRxReorderEntry = (struct rx_reorder_entry *)list_entry(pTS->RxPendingPktList.prev, struct rx_reorder_entry, List);
RTLLIB_DEBUG(RTLLIB_DL_REORDER,"%s(): Indicate SeqNum %d!\n",__func__, pRxReorderEntry->SeqNum); RTLLIB_DEBUG(RTLLIB_DL_REORDER, "%s(): Indicate SeqNum %d!\n", __func__, pRxReorderEntry->SeqNum);
list_del_init(&pRxReorderEntry->List); list_del_init(&pRxReorderEntry->List);
RfdArray[RfdCnt] = pRxReorderEntry->prxb; RfdArray[RfdCnt] = pRxReorderEntry->prxb;
...@@ -556,41 +539,38 @@ rtllib_FlushRxTsPendingPkts(struct rtllib_device *ieee, struct rx_ts_record *pTS ...@@ -556,41 +539,38 @@ rtllib_FlushRxTsPendingPkts(struct rtllib_device *ieee, struct rx_ts_record *pTS
pTS->RxIndicateSeq = 0xffff; pTS->RxIndicateSeq = 0xffff;
} }
void RxReorderIndicatePacket(struct rtllib_device *ieee, struct rtllib_rxb *prxb,
void RxReorderIndicatePacket( struct rtllib_device *ieee, struct rx_ts_record *pTS, u16 SeqNum)
struct rtllib_rxb* prxb,
struct rx_ts_record *pTS,
u16 SeqNum)
{ {
struct rt_hi_throughput *pHTInfo = ieee->pHTInfo; struct rt_hi_throughput *pHTInfo = ieee->pHTInfo;
struct rx_reorder_entry *pReorderEntry = NULL; struct rx_reorder_entry *pReorderEntry = NULL;
struct rtllib_rxb* prxbIndicateArray[REORDER_WIN_SIZE]; struct rtllib_rxb *prxbIndicateArray[REORDER_WIN_SIZE];
u8 WinSize = pHTInfo->RxReorderWinSize; u8 WinSize = pHTInfo->RxReorderWinSize;
u16 WinEnd = 0; u16 WinEnd = 0;
u8 index = 0; u8 index = 0;
bool bMatchWinStart = false, bPktInBuf = false; bool bMatchWinStart = false, bPktInBuf = false;
unsigned long flags; unsigned long flags;
RTLLIB_DEBUG(RTLLIB_DL_REORDER,"%s(): Seq is %d,pTS->RxIndicateSeq is %d, WinSize is %d\n",__func__,SeqNum,pTS->RxIndicateSeq,WinSize); RTLLIB_DEBUG(RTLLIB_DL_REORDER, "%s(): Seq is %d, pTS->RxIndicateSeq"
" is %d, WinSize is %d\n", __func__, SeqNum,
pTS->RxIndicateSeq, WinSize);
spin_lock_irqsave(&(ieee->reorder_spinlock), flags); spin_lock_irqsave(&(ieee->reorder_spinlock), flags);
WinEnd = (pTS->RxIndicateSeq + WinSize -1)%4096; WinEnd = (pTS->RxIndicateSeq + WinSize - 1) % 4096;
/* Rx Reorder initialize condition.*/ /* Rx Reorder initialize condition.*/
if (pTS->RxIndicateSeq == 0xffff) { if (pTS->RxIndicateSeq == 0xffff)
pTS->RxIndicateSeq = SeqNum; pTS->RxIndicateSeq = SeqNum;
}
/* Drop out the packet which SeqNum is smaller than WinStart */ /* Drop out the packet which SeqNum is smaller than WinStart */
if (SN_LESS(SeqNum, pTS->RxIndicateSeq)) { if (SN_LESS(SeqNum, pTS->RxIndicateSeq)) {
RTLLIB_DEBUG(RTLLIB_DL_REORDER,"Packet Drop! IndicateSeq: %d, NewSeq: %d\n", RTLLIB_DEBUG(RTLLIB_DL_REORDER, "Packet Drop! IndicateSeq: %d, NewSeq: %d\n",
pTS->RxIndicateSeq, SeqNum); pTS->RxIndicateSeq, SeqNum);
pHTInfo->RxReorderDropCounter++; pHTInfo->RxReorderDropCounter++;
{ {
int i; int i;
for (i =0; i < prxb->nr_subframes; i++) { for (i = 0; i < prxb->nr_subframes; i++)
dev_kfree_skb(prxb->subframes[i]); dev_kfree_skb(prxb->subframes[i]);
}
kfree(prxb); kfree(prxb);
prxb = NULL; prxb = NULL;
} }
...@@ -607,33 +587,38 @@ void RxReorderIndicatePacket( struct rtllib_device *ieee, ...@@ -607,33 +587,38 @@ void RxReorderIndicatePacket( struct rtllib_device *ieee,
pTS->RxIndicateSeq = (pTS->RxIndicateSeq + 1) % 4096; pTS->RxIndicateSeq = (pTS->RxIndicateSeq + 1) % 4096;
bMatchWinStart = true; bMatchWinStart = true;
} else if (SN_LESS(WinEnd, SeqNum)) { } else if (SN_LESS(WinEnd, SeqNum)) {
if (SeqNum >= (WinSize - 1)) { if (SeqNum >= (WinSize - 1))
pTS->RxIndicateSeq = SeqNum + 1 -WinSize; pTS->RxIndicateSeq = SeqNum + 1 - WinSize;
} else { else
pTS->RxIndicateSeq = 4095 - (WinSize - (SeqNum +1)) + 1; pTS->RxIndicateSeq = 4095 - (WinSize - (SeqNum + 1)) + 1;
} RTLLIB_DEBUG(RTLLIB_DL_REORDER, "Window Shift! IndicateSeq: %d,"
RTLLIB_DEBUG(RTLLIB_DL_REORDER, "Window Shift! IndicateSeq: %d, NewSeq: %d\n",pTS->RxIndicateSeq, SeqNum); " NewSeq: %d\n", pTS->RxIndicateSeq, SeqNum);
} }
/* /*
* Indication process. * Indication process.
* After Packet dropping and Sliding Window shifting as above, we can now just indicate the packets * After Packet dropping and Sliding Window shifting as above, we can
* with the SeqNum smaller than latest WinStart and struct buffer other packets. * now just indicate the packets with the SeqNum smaller than latest
* WinStart and struct buffer other packets.
*/ */
/* For Rx Reorder condition: /* For Rx Reorder condition:
* 1. All packets with SeqNum smaller than WinStart => Indicate * 1. All packets with SeqNum smaller than WinStart => Indicate
* 2. All packets with SeqNum larger than or equal to WinStart => Buffer it. * 2. All packets with SeqNum larger than or equal to
* WinStart => Buffer it.
*/ */
if (bMatchWinStart) { if (bMatchWinStart) {
/* Current packet is going to be indicated.*/ /* Current packet is going to be indicated.*/
RTLLIB_DEBUG(RTLLIB_DL_REORDER, "Packets indication!! IndicateSeq: %d, NewSeq: %d\n",\ RTLLIB_DEBUG(RTLLIB_DL_REORDER, "Packets indication!! "
"IndicateSeq: %d, NewSeq: %d\n",
pTS->RxIndicateSeq, SeqNum); pTS->RxIndicateSeq, SeqNum);
prxbIndicateArray[0] = prxb; prxbIndicateArray[0] = prxb;
index = 1; index = 1;
} else { } else {
/* Current packet is going to be inserted into pending list.*/ /* Current packet is going to be inserted into pending list.*/
if (!list_empty(&ieee->RxReorder_Unused_List)) { if (!list_empty(&ieee->RxReorder_Unused_List)) {
pReorderEntry = (struct rx_reorder_entry *)list_entry(ieee->RxReorder_Unused_List.next,struct rx_reorder_entry,List); pReorderEntry = (struct rx_reorder_entry *)
list_entry(ieee->RxReorder_Unused_List.next,
struct rx_reorder_entry, List);
list_del_init(&pReorderEntry->List); list_del_init(&pReorderEntry->List);
/* Make a reorder entry and insert into a the packet list.*/ /* Make a reorder entry and insert into a the packet list.*/
...@@ -641,34 +626,40 @@ void RxReorderIndicatePacket( struct rtllib_device *ieee, ...@@ -641,34 +626,40 @@ void RxReorderIndicatePacket( struct rtllib_device *ieee,
pReorderEntry->prxb = prxb; pReorderEntry->prxb = prxb;
if (!AddReorderEntry(pTS, pReorderEntry)) { if (!AddReorderEntry(pTS, pReorderEntry)) {
RTLLIB_DEBUG(RTLLIB_DL_REORDER, "%s(): Duplicate packet is dropped!! IndicateSeq: %d, NewSeq: %d\n", RTLLIB_DEBUG(RTLLIB_DL_REORDER,
__func__, pTS->RxIndicateSeq, SeqNum); "%s(): Duplicate packet is "
list_add_tail(&pReorderEntry->List,&ieee->RxReorder_Unused_List); "dropped!! IndicateSeq: %d, "
{ "NewSeq: %d\n",
__func__, pTS->RxIndicateSeq,
SeqNum);
list_add_tail(&pReorderEntry->List,
&ieee->RxReorder_Unused_List); {
int i; int i;
for (i =0; i < prxb->nr_subframes; i++) { for (i = 0; i < prxb->nr_subframes; i++)
dev_kfree_skb(prxb->subframes[i]); dev_kfree_skb(prxb->subframes[i]);
}
kfree(prxb); kfree(prxb);
prxb = NULL; prxb = NULL;
} }
} else { } else {
RTLLIB_DEBUG(RTLLIB_DL_REORDER, RTLLIB_DEBUG(RTLLIB_DL_REORDER,
"Pkt insert into struct buffer!! IndicateSeq: %d, NewSeq: %d\n",pTS->RxIndicateSeq, SeqNum); "Pkt insert into struct buffer!! "
} "IndicateSeq: %d, NewSeq: %d\n",
pTS->RxIndicateSeq, SeqNum);
} }
else { } else {
/* /*
* Packets are dropped if there is not enough reorder entries. * Packets are dropped if there are not enough reorder
* This part shall be modified!! We can just indicate all the * entries. This part should be modified!! We can just
* packets in struct buffer and get reorder entries. * indicate all the packets in struct buffer and get
* reorder entries.
*/ */
RTLLIB_DEBUG(RTLLIB_DL_ERR, "RxReorderIndicatePacket(): There is no reorder entry!! Packet is dropped!!\n"); RTLLIB_DEBUG(RTLLIB_DL_ERR, "RxReorderIndicatePacket():"
" There is no reorder entry!! Packet is "
"dropped!!\n");
{ {
int i; int i;
for (i =0; i < prxb->nr_subframes; i++) { for (i = 0; i < prxb->nr_subframes; i++)
dev_kfree_skb(prxb->subframes[i]); dev_kfree_skb(prxb->subframes[i]);
}
kfree(prxb); kfree(prxb);
prxb = NULL; prxb = NULL;
} }
...@@ -676,16 +667,17 @@ void RxReorderIndicatePacket( struct rtllib_device *ieee, ...@@ -676,16 +667,17 @@ void RxReorderIndicatePacket( struct rtllib_device *ieee,
} }
/* Check if there is any packet need indicate.*/ /* Check if there is any packet need indicate.*/
while(!list_empty(&pTS->RxPendingPktList)) { while (!list_empty(&pTS->RxPendingPktList)) {
RTLLIB_DEBUG(RTLLIB_DL_REORDER,"%s(): start RREORDER indicate\n",__func__); RTLLIB_DEBUG(RTLLIB_DL_REORDER, "%s(): start RREORDER indicate\n", __func__);
pReorderEntry = (struct rx_reorder_entry *)list_entry(pTS->RxPendingPktList.prev,struct rx_reorder_entry,List); pReorderEntry = (struct rx_reorder_entry *)list_entry(pTS->RxPendingPktList.prev,
if ( SN_LESS(pReorderEntry->SeqNum, pTS->RxIndicateSeq) || struct rx_reorder_entry, List);
SN_EQUAL(pReorderEntry->SeqNum, pTS->RxIndicateSeq)) if (SN_LESS(pReorderEntry->SeqNum, pTS->RxIndicateSeq) ||
{ SN_EQUAL(pReorderEntry->SeqNum, pTS->RxIndicateSeq)) {
/* This protect struct buffer from overflow. */ /* This protect struct buffer from overflow. */
if (index >= REORDER_WIN_SIZE) { if (index >= REORDER_WIN_SIZE) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "RxReorderIndicatePacket(): Buffer overflow!! \n"); RTLLIB_DEBUG(RTLLIB_DL_ERR, "RxReorderIndicate"
"Packet(): Buffer overflow!!\n");
bPktInBuf = true; bPktInBuf = true;
break; break;
} }
...@@ -696,74 +688,76 @@ void RxReorderIndicatePacket( struct rtllib_device *ieee, ...@@ -696,74 +688,76 @@ void RxReorderIndicatePacket( struct rtllib_device *ieee,
pTS->RxIndicateSeq = (pTS->RxIndicateSeq + 1) % 4096; pTS->RxIndicateSeq = (pTS->RxIndicateSeq + 1) % 4096;
prxbIndicateArray[index] = pReorderEntry->prxb; prxbIndicateArray[index] = pReorderEntry->prxb;
RTLLIB_DEBUG(RTLLIB_DL_REORDER,"%s(): Indicate SeqNum %d!\n",__func__, pReorderEntry->SeqNum); RTLLIB_DEBUG(RTLLIB_DL_REORDER, "%s(): Indicate SeqNum"
" %d!\n", __func__, pReorderEntry->SeqNum);
index++; index++;
list_add_tail(&pReorderEntry->List,&ieee->RxReorder_Unused_List); list_add_tail(&pReorderEntry->List,
&ieee->RxReorder_Unused_List);
} else { } else {
bPktInBuf = true; bPktInBuf = true;
break; break;
} }
} }
/* Handling pending timer. Set this timer to prevent from long time Rx buffering.*/ /* Handling pending timer. Set this timer to prevent from long time
if (index>0) { * Rx buffering.*/
if (timer_pending(&pTS->RxPktPendingTimer)){ if (index > 0) {
if (timer_pending(&pTS->RxPktPendingTimer))
del_timer_sync(&pTS->RxPktPendingTimer); del_timer_sync(&pTS->RxPktPendingTimer);
}
pTS->RxTimeoutIndicateSeq = 0xffff; pTS->RxTimeoutIndicateSeq = 0xffff;
if (index>REORDER_WIN_SIZE){ if (index > REORDER_WIN_SIZE) {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "RxReorderIndicatePacket(): Rx Reorer struct buffer full!! \n"); RTLLIB_DEBUG(RTLLIB_DL_ERR, "RxReorderIndicatePacket():"
spin_unlock_irqrestore(&(ieee->reorder_spinlock), flags); " Rx Reorer struct buffer full!!\n");
spin_unlock_irqrestore(&(ieee->reorder_spinlock),
flags);
return; return;
} }
rtllib_indicate_packets(ieee, prxbIndicateArray, index); rtllib_indicate_packets(ieee, prxbIndicateArray, index);
bPktInBuf = false; bPktInBuf = false;
} }
if (bPktInBuf && pTS->RxTimeoutIndicateSeq==0xffff) { if (bPktInBuf && pTS->RxTimeoutIndicateSeq == 0xffff) {
RTLLIB_DEBUG(RTLLIB_DL_REORDER,"%s(): SET rx timeout timer\n", __func__); RTLLIB_DEBUG(RTLLIB_DL_REORDER, "%s(): SET rx timeout timer\n",
__func__);
pTS->RxTimeoutIndicateSeq = pTS->RxIndicateSeq; pTS->RxTimeoutIndicateSeq = pTS->RxIndicateSeq;
mod_timer(&pTS->RxPktPendingTimer, jiffies + MSECS(pHTInfo->RxReorderPendingTime)); mod_timer(&pTS->RxPktPendingTimer, jiffies +
MSECS(pHTInfo->RxReorderPendingTime));
} }
spin_unlock_irqrestore(&(ieee->reorder_spinlock), flags); spin_unlock_irqrestore(&(ieee->reorder_spinlock), flags);
} }
u8 parse_subframe(struct rtllib_device* ieee,struct sk_buff *skb, u8 parse_subframe(struct rtllib_device *ieee, struct sk_buff *skb,
struct rtllib_rx_stats *rx_stats, struct rtllib_rx_stats *rx_stats,
struct rtllib_rxb *rxb,u8* src,u8* dst) struct rtllib_rxb *rxb, u8 *src, u8 *dst)
{ {
struct rtllib_hdr_3addr *hdr = (struct rtllib_hdr_3addr* )skb->data; struct rtllib_hdr_3addr *hdr = (struct rtllib_hdr_3addr *)skb->data;
u16 fc = le16_to_cpu(hdr->frame_ctl); u16 fc = le16_to_cpu(hdr->frame_ctl);
u16 LLCOffset= sizeof(struct rtllib_hdr_3addr); u16 LLCOffset = sizeof(struct rtllib_hdr_3addr);
u16 ChkLength; u16 ChkLength;
bool bIsAggregateFrame = false; bool bIsAggregateFrame = false;
u16 nSubframe_Length; u16 nSubframe_Length;
u8 nPadding_Length = 0; u8 nPadding_Length = 0;
u16 SeqNum=0; u16 SeqNum = 0;
struct sk_buff *sub_skb; struct sk_buff *sub_skb;
u8 *data_ptr; u8 *data_ptr;
/* just for debug purpose */ /* just for debug purpose */
SeqNum = WLAN_GET_SEQ_SEQ(le16_to_cpu(hdr->seq_ctl)); SeqNum = WLAN_GET_SEQ_SEQ(le16_to_cpu(hdr->seq_ctl));
if ((RTLLIB_QOS_HAS_SEQ(fc))&&\ if ((RTLLIB_QOS_HAS_SEQ(fc)) &&
(((union frameqos *)(skb->data + RTLLIB_3ADDR_LEN))->field.reserved)) { (((union frameqos *)(skb->data + RTLLIB_3ADDR_LEN))->field.reserved))
bIsAggregateFrame = true; bIsAggregateFrame = true;
}
if (RTLLIB_QOS_HAS_SEQ(fc)) { if (RTLLIB_QOS_HAS_SEQ(fc))
LLCOffset += 2; LLCOffset += 2;
} if (rx_stats->bContainHTC)
if (rx_stats->bContainHTC) {
LLCOffset += sHTCLng; LLCOffset += sHTCLng;
}
ChkLength = LLCOffset;/* + (Frame_WEP(frame)!=0 ?Adapter->MgntInfo.SecurityInfo.EncryptionHeadOverhead:0);*/ ChkLength = LLCOffset;
if ( skb->len <= ChkLength ) { if (skb->len <= ChkLength)
return 0; return 0;
}
skb_pull(skb, LLCOffset); skb_pull(skb, LLCOffset);
ieee->bIsAggregateFrame = bIsAggregateFrame; ieee->bIsAggregateFrame = bIsAggregateFrame;
...@@ -787,25 +781,31 @@ u8 parse_subframe(struct rtllib_device* ieee,struct sk_buff *skb, ...@@ -787,25 +781,31 @@ u8 parse_subframe(struct rtllib_device* ieee,struct sk_buff *skb,
rxb->subframes[0] = sub_skb; rxb->subframes[0] = sub_skb;
memcpy(rxb->src,src,ETH_ALEN); memcpy(rxb->src, src, ETH_ALEN);
memcpy(rxb->dst,dst,ETH_ALEN); memcpy(rxb->dst, dst, ETH_ALEN);
rxb->subframes[0]->dev = ieee->dev; rxb->subframes[0]->dev = ieee->dev;
return 1; return 1;
} else { } else {
rxb->nr_subframes = 0; rxb->nr_subframes = 0;
memcpy(rxb->src,src,ETH_ALEN); memcpy(rxb->src, src, ETH_ALEN);
memcpy(rxb->dst,dst,ETH_ALEN); memcpy(rxb->dst, dst, ETH_ALEN);
while(skb->len > ETHERNET_HEADER_SIZE) { while (skb->len > ETHERNET_HEADER_SIZE) {
/* Offset 12 denote 2 mac address */ /* Offset 12 denote 2 mac address */
nSubframe_Length = *((u16*)(skb->data + 12)); nSubframe_Length = *((u16 *)(skb->data + 12));
nSubframe_Length = (nSubframe_Length>>8) + (nSubframe_Length<<8); nSubframe_Length = (nSubframe_Length >> 8) +
(nSubframe_Length << 8);
if (skb->len<(ETHERNET_HEADER_SIZE + nSubframe_Length)) {
printk("%s: A-MSDU parse error!! pRfd->nTotalSubframe : %d\n",\ if (skb->len < (ETHERNET_HEADER_SIZE + nSubframe_Length)) {
__func__,rxb->nr_subframes); printk(KERN_INFO "%s: A-MSDU parse error!! "
printk("%s: A-MSDU parse error!! Subframe Length: %d\n",__func__, nSubframe_Length); "pRfd->nTotalSubframe : %d\n",\
printk("nRemain_Length is %d and nSubframe_Length is : %d\n",skb->len,nSubframe_Length); __func__, rxb->nr_subframes);
printk("The Packet SeqNum is %d\n",SeqNum); printk(KERN_INFO "%s: A-MSDU parse error!! "
"Subframe Length: %d\n", __func__,
nSubframe_Length);
printk(KERN_INFO "nRemain_Length is %d and "
"nSubframe_Length is : %d\n", skb->len,
nSubframe_Length);
printk(KERN_INFO "The Packet SeqNum is %d\n", SeqNum);
return 0; return 0;
} }
...@@ -824,27 +824,27 @@ u8 parse_subframe(struct rtllib_device* ieee,struct sk_buff *skb, ...@@ -824,27 +824,27 @@ u8 parse_subframe(struct rtllib_device* ieee,struct sk_buff *skb,
sub_skb = dev_alloc_skb(nSubframe_Length + 12); sub_skb = dev_alloc_skb(nSubframe_Length + 12);
skb_reserve(sub_skb, 12); skb_reserve(sub_skb, 12);
data_ptr = (u8 *)skb_put(sub_skb, nSubframe_Length); data_ptr = (u8 *)skb_put(sub_skb, nSubframe_Length);
memcpy(data_ptr,skb->data,nSubframe_Length); memcpy(data_ptr, skb->data, nSubframe_Length);
sub_skb->dev = ieee->dev; sub_skb->dev = ieee->dev;
rxb->subframes[rxb->nr_subframes++] = sub_skb; rxb->subframes[rxb->nr_subframes++] = sub_skb;
if (rxb->nr_subframes >= MAX_SUBFRAME_COUNT) { if (rxb->nr_subframes >= MAX_SUBFRAME_COUNT) {
RTLLIB_DEBUG_RX("ParseSubframe(): Too many Subframes! Packets dropped!\n"); RTLLIB_DEBUG_RX("ParseSubframe(): Too many "
"Subframes! Packets dropped!\n");
break; break;
} }
skb_pull(skb,nSubframe_Length); skb_pull(skb, nSubframe_Length);
if (skb->len != 0) { if (skb->len != 0) {
nPadding_Length = 4 - ((nSubframe_Length + ETHERNET_HEADER_SIZE) % 4); nPadding_Length = 4 - ((nSubframe_Length +
if (nPadding_Length == 4) { ETHERNET_HEADER_SIZE) % 4);
if (nPadding_Length == 4)
nPadding_Length = 0; nPadding_Length = 0;
}
if (skb->len < nPadding_Length) { if (skb->len < nPadding_Length)
return 0; return 0;
}
skb_pull(skb,nPadding_Length); skb_pull(skb, nPadding_Length);
} }
} }
...@@ -863,7 +863,7 @@ size_t rtllib_rx_get_hdrlen(struct rtllib_device *ieee, struct sk_buff *skb, ...@@ -863,7 +863,7 @@ size_t rtllib_rx_get_hdrlen(struct rtllib_device *ieee, struct sk_buff *skb,
hdrlen = rtllib_get_hdrlen(fc); hdrlen = rtllib_get_hdrlen(fc);
if (HTCCheck(ieee, skb->data)) { if (HTCCheck(ieee, skb->data)) {
if (net_ratelimit()) if (net_ratelimit())
printk("%s: find HTCControl!\n", __func__); printk(KERN_INFO "%s: find HTCControl!\n", __func__);
hdrlen += 4; hdrlen += 4;
rx_stats->bContainHTC = 1; rx_stats->bContainHTC = 1;
} }
...@@ -874,7 +874,8 @@ size_t rtllib_rx_get_hdrlen(struct rtllib_device *ieee, struct sk_buff *skb, ...@@ -874,7 +874,8 @@ size_t rtllib_rx_get_hdrlen(struct rtllib_device *ieee, struct sk_buff *skb,
return hdrlen; return hdrlen;
} }
int rtllib_rx_check_duplicate(struct rtllib_device *ieee, struct sk_buff *skb, u8 multicast) int rtllib_rx_check_duplicate(struct rtllib_device *ieee, struct sk_buff *skb,
u8 multicast)
{ {
struct rtllib_hdr_4addr *hdr = (struct rtllib_hdr_4addr *)skb->data; struct rtllib_hdr_4addr *hdr = (struct rtllib_hdr_4addr *)skb->data;
u16 fc, sc; u16 fc, sc;
...@@ -886,19 +887,18 @@ int rtllib_rx_check_duplicate(struct rtllib_device *ieee, struct sk_buff *skb, u ...@@ -886,19 +887,18 @@ int rtllib_rx_check_duplicate(struct rtllib_device *ieee, struct sk_buff *skb, u
sc = le16_to_cpu(hdr->seq_ctl); sc = le16_to_cpu(hdr->seq_ctl);
frag = WLAN_GET_SEQ_FRAG(sc); frag = WLAN_GET_SEQ_FRAG(sc);
if ( (ieee->pHTInfo->bCurRxReorderEnable == false) || if ((ieee->pHTInfo->bCurRxReorderEnable == false) ||
!ieee->current_network.qos_data.active || !ieee->current_network.qos_data.active ||
!IsDataFrame(skb->data) || !IsDataFrame(skb->data) ||
IsLegacyDataFrame(skb->data)) { IsLegacyDataFrame(skb->data)) {
if (!((type == RTLLIB_FTYPE_MGMT) && (stype == RTLLIB_STYPE_BEACON))){ if (!((type == RTLLIB_FTYPE_MGMT) && (stype == RTLLIB_STYPE_BEACON))) {
if (is_duplicate_packet(ieee, hdr)){ if (is_duplicate_packet(ieee, hdr))
return -1; return -1;
} }
}
} else { } else {
struct rx_ts_record *pRxTS = NULL; struct rx_ts_record *pRxTS = NULL;
if (GetTs(ieee, (struct ts_common_info **) &pRxTS, hdr->addr2, if (GetTs(ieee, (struct ts_common_info **) &pRxTS, hdr->addr2,
(u8)Frame_QoSTID((u8*)(skb->data)), RX_DIR, true)) { (u8)Frame_QoSTID((u8 *)(skb->data)), RX_DIR, true)) {
if ((fc & (1<<11)) && (frag == pRxTS->RxLastFragNum) && if ((fc & (1<<11)) && (frag == pRxTS->RxLastFragNum) &&
(WLAN_GET_SEQ_SEQ(sc) == pRxTS->RxLastSeqNum)) { (WLAN_GET_SEQ_SEQ(sc) == pRxTS->RxLastSeqNum)) {
return -1; return -1;
...@@ -907,14 +907,18 @@ int rtllib_rx_check_duplicate(struct rtllib_device *ieee, struct sk_buff *skb, u ...@@ -907,14 +907,18 @@ int rtllib_rx_check_duplicate(struct rtllib_device *ieee, struct sk_buff *skb, u
pRxTS->RxLastSeqNum = WLAN_GET_SEQ_SEQ(sc); pRxTS->RxLastSeqNum = WLAN_GET_SEQ_SEQ(sc);
} }
} else { } else {
RTLLIB_DEBUG(RTLLIB_DL_ERR, "ERR!!%s(): No TS!! Skip the check!!\n",__func__); RTLLIB_DEBUG(RTLLIB_DL_ERR, "ERR!!%s(): No TS!! Skip"
" the check!!\n", __func__);
return -1; return -1;
} }
} }
return 0; return 0;
} }
void rtllib_rx_extract_addr(struct rtllib_device *ieee, struct rtllib_hdr_4addr *hdr, u8 *dst, u8 *src, u8 *bssid)
void rtllib_rx_extract_addr(struct rtllib_device *ieee,
struct rtllib_hdr_4addr *hdr, u8 *dst, u8 *src,
u8 *bssid)
{ {
u16 fc = le16_to_cpu(hdr->frame_ctl); u16 fc = le16_to_cpu(hdr->frame_ctl);
...@@ -941,7 +945,9 @@ void rtllib_rx_extract_addr(struct rtllib_device *ieee, struct rtllib_hdr_4addr ...@@ -941,7 +945,9 @@ void rtllib_rx_extract_addr(struct rtllib_device *ieee, struct rtllib_hdr_4addr
break; break;
} }
} }
int rtllib_rx_data_filter(struct rtllib_device *ieee, u16 fc, u8 *dst, u8 *src, u8 *bssid, u8 *addr2)
int rtllib_rx_data_filter(struct rtllib_device *ieee, u16 fc, u8 *dst, u8 *src,
u8 *bssid, u8 *addr2)
{ {
u8 zero_addr[ETH_ALEN] = {0}; u8 zero_addr[ETH_ALEN] = {0};
u8 type, stype; u8 type, stype;
...@@ -957,8 +963,8 @@ int rtllib_rx_data_filter(struct rtllib_device *ieee, u16 fc, u8 *dst, u8 *src, ...@@ -957,8 +963,8 @@ int rtllib_rx_data_filter(struct rtllib_device *ieee, u16 fc, u8 *dst, u8 *src,
} }
/* Filter packets sent by an STA that will be forwarded by AP */ /* Filter packets sent by an STA that will be forwarded by AP */
if ( ieee->IntelPromiscuousModeInfo.bPromiscuousOn && if (ieee->IntelPromiscuousModeInfo.bPromiscuousOn &&
ieee->IntelPromiscuousModeInfo.bFilterSourceStationFrame ) { ieee->IntelPromiscuousModeInfo.bFilterSourceStationFrame) {
if ((fc & RTLLIB_FCTL_TODS) && !(fc & RTLLIB_FCTL_FROMDS) && if ((fc & RTLLIB_FCTL_TODS) && !(fc & RTLLIB_FCTL_FROMDS) &&
(compare_ether_addr(dst, ieee->current_network.bssid) != 0) && (compare_ether_addr(dst, ieee->current_network.bssid) != 0) &&
(compare_ether_addr(bssid, ieee->current_network.bssid) == 0)) { (compare_ether_addr(bssid, ieee->current_network.bssid) == 0)) {
...@@ -968,13 +974,12 @@ int rtllib_rx_data_filter(struct rtllib_device *ieee, u16 fc, u8 *dst, u8 *src, ...@@ -968,13 +974,12 @@ int rtllib_rx_data_filter(struct rtllib_device *ieee, u16 fc, u8 *dst, u8 *src,
/* Nullfunc frames may have PS-bit set, so they must be passed to /* Nullfunc frames may have PS-bit set, so they must be passed to
* hostap_handle_sta_rx() before being dropped here. */ * hostap_handle_sta_rx() before being dropped here. */
if (!ieee->IntelPromiscuousModeInfo.bPromiscuousOn){ if (!ieee->IntelPromiscuousModeInfo.bPromiscuousOn) {
if (stype != RTLLIB_STYPE_DATA && if (stype != RTLLIB_STYPE_DATA &&
stype != RTLLIB_STYPE_DATA_CFACK && stype != RTLLIB_STYPE_DATA_CFACK &&
stype != RTLLIB_STYPE_DATA_CFPOLL && stype != RTLLIB_STYPE_DATA_CFPOLL &&
stype != RTLLIB_STYPE_DATA_CFACKPOLL&& stype != RTLLIB_STYPE_DATA_CFACKPOLL &&
stype != RTLLIB_STYPE_QOS_DATA stype != RTLLIB_STYPE_QOS_DATA) {
) {
if (stype != RTLLIB_STYPE_NULLFUNC) if (stype != RTLLIB_STYPE_NULLFUNC)
RTLLIB_DEBUG_DROP( RTLLIB_DEBUG_DROP(
"RX: dropped data frame " "RX: dropped data frame "
...@@ -992,18 +997,15 @@ int rtllib_rx_data_filter(struct rtllib_device *ieee, u16 fc, u8 *dst, u8 *src, ...@@ -992,18 +997,15 @@ int rtllib_rx_data_filter(struct rtllib_device *ieee, u16 fc, u8 *dst, u8 *src,
/* {broad,multi}cast packets to our BSS go through */ /* {broad,multi}cast packets to our BSS go through */
if (is_multicast_ether_addr(dst) || is_broadcast_ether_addr(dst)) { if (is_multicast_ether_addr(dst) || is_broadcast_ether_addr(dst)) {
if (memcmp(bssid, ieee->current_network.bssid, ETH_ALEN)) { if (memcmp(bssid, ieee->current_network.bssid, ETH_ALEN))
return -1; return -1;
} }
} }
}
return 0; return 0;
} }
int rtllib_rx_get_crypt(
struct rtllib_device *ieee, int rtllib_rx_get_crypt(struct rtllib_device *ieee, struct sk_buff *skb,
struct sk_buff *skb, struct rtllib_crypt_data **crypt, size_t hdrlen)
struct rtllib_crypt_data **crypt,
size_t hdrlen)
{ {
struct rtllib_hdr_4addr *hdr = (struct rtllib_hdr_4addr *)skb->data; struct rtllib_hdr_4addr *hdr = (struct rtllib_hdr_4addr *)skb->data;
u16 fc = le16_to_cpu(hdr->frame_ctl); u16 fc = le16_to_cpu(hdr->frame_ctl);
...@@ -1035,12 +1037,10 @@ int rtllib_rx_get_crypt( ...@@ -1035,12 +1037,10 @@ int rtllib_rx_get_crypt(
return 0; return 0;
} }
int rtllib_rx_decrypt(
struct rtllib_device *ieee, int rtllib_rx_decrypt(struct rtllib_device *ieee, struct sk_buff *skb,
struct sk_buff *skb,
struct rtllib_rx_stats *rx_stats, struct rtllib_rx_stats *rx_stats,
struct rtllib_crypt_data *crypt, struct rtllib_crypt_data *crypt, size_t hdrlen)
size_t hdrlen)
{ {
struct rtllib_hdr_4addr *hdr; struct rtllib_hdr_4addr *hdr;
int keyidx = 0; int keyidx = 0;
...@@ -1052,15 +1052,14 @@ int rtllib_rx_decrypt( ...@@ -1052,15 +1052,14 @@ int rtllib_rx_decrypt(
sc = le16_to_cpu(hdr->seq_ctl); sc = le16_to_cpu(hdr->seq_ctl);
frag = WLAN_GET_SEQ_FRAG(sc); frag = WLAN_GET_SEQ_FRAG(sc);
if ((!rx_stats->Decrypted)){ if ((!rx_stats->Decrypted))
ieee->need_sw_enc = 1; ieee->need_sw_enc = 1;
}else{ else
ieee->need_sw_enc = 0; ieee->need_sw_enc = 0;
}
if (ieee->host_decrypt && (fc & RTLLIB_FCTL_WEP) && keyidx = rtllib_rx_frame_decrypt(ieee, skb, crypt);
((keyidx = rtllib_rx_frame_decrypt(ieee, skb, crypt)) < 0)) { if (ieee->host_decrypt && (fc & RTLLIB_FCTL_WEP) && (keyidx < 0)) {
printk("%s: decrypt frame error\n", __func__); printk(KERN_INFO "%s: decrypt frame error\n", __func__);
return -1; return -1;
} }
...@@ -1120,9 +1119,8 @@ int rtllib_rx_decrypt( ...@@ -1120,9 +1119,8 @@ int rtllib_rx_decrypt(
/* skb: hdr + (possible reassembled) full MSDU payload; possibly still /* skb: hdr + (possible reassembled) full MSDU payload; possibly still
* encrypted/authenticated */ * encrypted/authenticated */
if (ieee->host_decrypt && (fc & RTLLIB_FCTL_WEP) && if (ieee->host_decrypt && (fc & RTLLIB_FCTL_WEP) &&
rtllib_rx_frame_decrypt_msdu(ieee, skb, keyidx, crypt)) rtllib_rx_frame_decrypt_msdu(ieee, skb, keyidx, crypt)) {
{ printk(KERN_INFO "%s: ==>decrypt msdu error\n", __func__);
printk("%s: ==>decrypt msdu error\n", __func__);
return -1; return -1;
} }
...@@ -1164,21 +1162,20 @@ int rtllib_rx_decrypt( ...@@ -1164,21 +1162,20 @@ int rtllib_rx_decrypt(
return -1; return -1;
} }
if (rtllib_is_eapol_frame(ieee, skb, hdrlen)) { if (rtllib_is_eapol_frame(ieee, skb, hdrlen))
printk(KERN_WARNING "RX: IEEE802.1X EAPOL frame!\n"); printk(KERN_WARNING "RX: IEEE802.1X EAPOL frame!\n");
}
return 0; return 0;
} }
void rtllib_rx_check_leave_lps(struct rtllib_device *ieee, u8 unicast, u8 nr_subframes) void rtllib_rx_check_leave_lps(struct rtllib_device *ieee, u8 unicast, u8 nr_subframes)
{ {
if (unicast){ if (unicast) {
if ((ieee->state == RTLLIB_LINKED) /*&& !MgntInitAdapterInProgress(pMgntInfo)*/) if ((ieee->state == RTLLIB_LINKED)) {
{ if (((ieee->LinkDetectInfo.NumRxUnicastOkInPeriod +
if ( ((ieee->LinkDetectInfo.NumRxUnicastOkInPeriod +ieee->LinkDetectInfo.NumTxOkInPeriod) > 8 ) || ieee->LinkDetectInfo.NumTxOkInPeriod) > 8) ||
(ieee->LinkDetectInfo.NumRxUnicastOkInPeriod > 2) ) (ieee->LinkDetectInfo.NumRxUnicastOkInPeriod > 2)) {
{
if (ieee->LeisurePSLeave) if (ieee->LeisurePSLeave)
ieee->LeisurePSLeave(ieee->dev); ieee->LeisurePSLeave(ieee->dev);
} }
...@@ -1186,10 +1183,10 @@ void rtllib_rx_check_leave_lps(struct rtllib_device *ieee, u8 unicast, u8 nr_sub ...@@ -1186,10 +1183,10 @@ void rtllib_rx_check_leave_lps(struct rtllib_device *ieee, u8 unicast, u8 nr_sub
} }
ieee->last_rx_ps_time = jiffies; ieee->last_rx_ps_time = jiffies;
} }
void rtllib_rx_indicate_pkt_legacy(
struct rtllib_device *ieee, void rtllib_rx_indicate_pkt_legacy(struct rtllib_device *ieee,
struct rtllib_rx_stats *rx_stats, struct rtllib_rx_stats *rx_stats,
struct rtllib_rxb* rxb, struct rtllib_rxb *rxb,
u8 *dst, u8 *dst,
u8 *src) u8 *src)
{ {
...@@ -1197,12 +1194,12 @@ void rtllib_rx_indicate_pkt_legacy( ...@@ -1197,12 +1194,12 @@ void rtllib_rx_indicate_pkt_legacy(
u16 ethertype; u16 ethertype;
int i = 0; int i = 0;
if (rxb == NULL){ if (rxb == NULL) {
printk("%s: rxb is NULL!!\n", __func__); printk(KERN_INFO "%s: rxb is NULL!!\n", __func__);
return ; return ;
} }
for (i = 0; i<rxb->nr_subframes; i++) { for (i = 0; i < rxb->nr_subframes; i++) {
struct sk_buff *sub_skb = rxb->subframes[i]; struct sk_buff *sub_skb = rxb->subframes[i];
if (sub_skb) { if (sub_skb) {
...@@ -1229,9 +1226,8 @@ void rtllib_rx_indicate_pkt_legacy( ...@@ -1229,9 +1226,8 @@ void rtllib_rx_indicate_pkt_legacy(
ieee->stats.rx_packets++; ieee->stats.rx_packets++;
ieee->stats.rx_bytes += sub_skb->len; ieee->stats.rx_bytes += sub_skb->len;
if (is_multicast_ether_addr(dst)) { if (is_multicast_ether_addr(dst))
ieee->stats.multicast++; ieee->stats.multicast++;
}
/* Indicat the packets to upper layer */ /* Indicat the packets to upper layer */
memset(sub_skb->cb, 0, sizeof(sub_skb->cb)); memset(sub_skb->cb, 0, sizeof(sub_skb->cb));
...@@ -1246,13 +1242,14 @@ void rtllib_rx_indicate_pkt_legacy( ...@@ -1246,13 +1242,14 @@ void rtllib_rx_indicate_pkt_legacy(
kfree(rxb); kfree(rxb);
rxb = NULL; rxb = NULL;
} }
int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb, int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb,
struct rtllib_rx_stats *rx_stats) struct rtllib_rx_stats *rx_stats)
{ {
struct net_device *dev = ieee->dev; struct net_device *dev = ieee->dev;
struct rtllib_hdr_4addr *hdr = (struct rtllib_hdr_4addr *)skb->data; struct rtllib_hdr_4addr *hdr = (struct rtllib_hdr_4addr *)skb->data;
struct rtllib_crypt_data *crypt = NULL; struct rtllib_crypt_data *crypt = NULL;
struct rtllib_rxb* rxb = NULL; struct rtllib_rxb *rxb = NULL;
struct rx_ts_record *pTS = NULL; struct rx_ts_record *pTS = NULL;
u16 fc, sc, SeqNum = 0; u16 fc, sc, SeqNum = 0;
u8 type, stype, multicast = 0, unicast = 0, nr_subframes = 0, TID = 0; u8 type, stype, multicast = 0, unicast = 0, nr_subframes = 0, TID = 0;
...@@ -1279,8 +1276,8 @@ int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb, ...@@ -1279,8 +1276,8 @@ int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb,
/*Filter pkt has too small length */ /*Filter pkt has too small length */
hdrlen = rtllib_rx_get_hdrlen(ieee, skb, rx_stats); hdrlen = rtllib_rx_get_hdrlen(ieee, skb, rx_stats);
if (skb->len < hdrlen){ if (skb->len < hdrlen) {
printk("%s():ERR!!! skb->len is smaller than hdrlen\n",__func__); printk(KERN_INFO "%s():ERR!!! skb->len is smaller than hdrlen\n", __func__);
goto rx_dropped; goto rx_dropped;
} }
...@@ -1290,9 +1287,8 @@ int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb, ...@@ -1290,9 +1287,8 @@ int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb,
goto rx_dropped; goto rx_dropped;
/* Filter CTRL Frame */ /* Filter CTRL Frame */
if (type == RTLLIB_FTYPE_CTL) { if (type == RTLLIB_FTYPE_CTL)
goto rx_dropped; goto rx_dropped;
}
/* Filter MGNT Frame */ /* Filter MGNT Frame */
if (type == RTLLIB_FTYPE_MGMT) { if (type == RTLLIB_FTYPE_MGMT) {
...@@ -1307,7 +1303,7 @@ int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb, ...@@ -1307,7 +1303,7 @@ int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb,
/* Filter WAPI DATA Frame */ /* Filter WAPI DATA Frame */
/* Update statstics for AP roaming */ /* Update statstics for AP roaming */
if (!bToOtherSTA){ if (!bToOtherSTA) {
ieee->LinkDetectInfo.NumRecvDataInPeriod++; ieee->LinkDetectInfo.NumRecvDataInPeriod++;
ieee->LinkDetectInfo.NumRxOkInPeriod++; ieee->LinkDetectInfo.NumRxOkInPeriod++;
} }
...@@ -1321,9 +1317,8 @@ int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb, ...@@ -1321,9 +1317,8 @@ int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb,
if (ret < 0) if (ret < 0)
goto rx_dropped; goto rx_dropped;
if (skb->len == hdrlen){ if (skb->len == hdrlen)
goto rx_dropped; goto rx_dropped;
}
/* Send pspoll based on moredata */ /* Send pspoll based on moredata */
if ((ieee->iw_mode == IW_MODE_INFRA) && (ieee->sta_sleep == LPS_IS_SLEEP) if ((ieee->iw_mode == IW_MODE_INFRA) && (ieee->sta_sleep == LPS_IS_SLEEP)
...@@ -1352,32 +1347,29 @@ int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb, ...@@ -1352,32 +1347,29 @@ int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb,
hdr = (struct rtllib_hdr_4addr *) skb->data; hdr = (struct rtllib_hdr_4addr *) skb->data;
if (ieee->current_network.qos_data.active && IsQoSDataFrame(skb->data) if (ieee->current_network.qos_data.active && IsQoSDataFrame(skb->data)
&& !is_multicast_ether_addr(hdr->addr1) && !is_broadcast_ether_addr(hdr->addr1) && !is_multicast_ether_addr(hdr->addr1) && !is_broadcast_ether_addr(hdr->addr1)
&& (!bToOtherSTA)) && (!bToOtherSTA)) {
{
TID = Frame_QoSTID(skb->data); TID = Frame_QoSTID(skb->data);
SeqNum = WLAN_GET_SEQ_SEQ(sc); SeqNum = WLAN_GET_SEQ_SEQ(sc);
GetTs(ieee,(struct ts_common_info **) &pTS,hdr->addr2,TID,RX_DIR,true); GetTs(ieee, (struct ts_common_info **) &pTS, hdr->addr2, TID, RX_DIR, true);
if (TID !=0 && TID !=3){ if (TID != 0 && TID != 3)
ieee->bis_any_nonbepkts = true; ieee->bis_any_nonbepkts = true;
} }
}
/* Parse rx data frame (For AMSDU) */ /* Parse rx data frame (For AMSDU) */
/* skb: hdr + (possible reassembled) full plaintext payload */ /* skb: hdr + (possible reassembled) full plaintext payload */
payload = skb->data + hdrlen; payload = skb->data + hdrlen;
rxb = (struct rtllib_rxb*)kmalloc(sizeof(struct rtllib_rxb),GFP_ATOMIC); rxb = kmalloc(sizeof(struct rtllib_rxb), GFP_ATOMIC);
if (rxb == NULL) if (rxb == NULL) {
{ RTLLIB_DEBUG(RTLLIB_DL_ERR,
RTLLIB_DEBUG(RTLLIB_DL_ERR,"%s(): kmalloc rxb error\n",__func__); "%s(): kmalloc rxb error\n", __func__);
goto rx_dropped; goto rx_dropped;
} }
/* to parse amsdu packets */ /* to parse amsdu packets */
/* qos data packets & reserved bit is 1 */ /* qos data packets & reserved bit is 1 */
if (parse_subframe(ieee,skb,rx_stats,rxb,src,dst) == 0) { if (parse_subframe(ieee, skb, rx_stats, rxb, src, dst) == 0) {
/* only to free rxb, and not submit the packets to upper layer */ /* only to free rxb, and not submit the packets to upper layer */
for (i =0; i < rxb->nr_subframes; i++) { for (i = 0; i < rxb->nr_subframes; i++)
dev_kfree_skb(rxb->subframes[i]); dev_kfree_skb(rxb->subframes[i]);
}
kfree(rxb); kfree(rxb);
rxb = NULL; rxb = NULL;
goto rx_dropped; goto rx_dropped;
...@@ -1386,7 +1378,7 @@ int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb, ...@@ -1386,7 +1378,7 @@ int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb,
/* Update WAPI PN */ /* Update WAPI PN */
/* Check if leave LPS */ /* Check if leave LPS */
if (!bToOtherSTA){ if (!bToOtherSTA) {
if (ieee->bIsAggregateFrame) if (ieee->bIsAggregateFrame)
nr_subframes = rxb->nr_subframes; nr_subframes = rxb->nr_subframes;
else else
...@@ -1397,11 +1389,10 @@ int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb, ...@@ -1397,11 +1389,10 @@ int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb,
} }
/* Indicate packets to upper layer or Rx Reorder */ /* Indicate packets to upper layer or Rx Reorder */
if (ieee->pHTInfo->bCurRxReorderEnable == false ||pTS == NULL || bToOtherSTA){ if (ieee->pHTInfo->bCurRxReorderEnable == false || pTS == NULL || bToOtherSTA)
rtllib_rx_indicate_pkt_legacy(ieee, rx_stats, rxb, dst, src); rtllib_rx_indicate_pkt_legacy(ieee, rx_stats, rxb, dst, src);
}else{ else
RxReorderIndicatePacket(ieee, rxb, pTS, SeqNum); RxReorderIndicatePacket(ieee, rxb, pTS, SeqNum);
}
dev_kfree_skb(skb); dev_kfree_skb(skb);
...@@ -1409,8 +1400,7 @@ int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb, ...@@ -1409,8 +1400,7 @@ int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb,
return 1; return 1;
rx_dropped: rx_dropped:
if (rxb != NULL) if (rxb != NULL) {
{
kfree(rxb); kfree(rxb);
rxb = NULL; rxb = NULL;
} }
...@@ -1427,6 +1417,7 @@ int rtllib_rx_Master(struct rtllib_device *ieee, struct sk_buff *skb, ...@@ -1427,6 +1417,7 @@ int rtllib_rx_Master(struct rtllib_device *ieee, struct sk_buff *skb,
{ {
return 0; return 0;
} }
int rtllib_rx_Monitor(struct rtllib_device *ieee, struct sk_buff *skb, int rtllib_rx_Monitor(struct rtllib_device *ieee, struct sk_buff *skb,
struct rtllib_rx_stats *rx_stats) struct rtllib_rx_stats *rx_stats)
{ {
...@@ -1434,14 +1425,14 @@ int rtllib_rx_Monitor(struct rtllib_device *ieee, struct sk_buff *skb, ...@@ -1434,14 +1425,14 @@ int rtllib_rx_Monitor(struct rtllib_device *ieee, struct sk_buff *skb,
u16 fc = le16_to_cpu(hdr->frame_ctl); u16 fc = le16_to_cpu(hdr->frame_ctl);
size_t hdrlen = rtllib_get_hdrlen(fc); size_t hdrlen = rtllib_get_hdrlen(fc);
if (skb->len < hdrlen){ if (skb->len < hdrlen) {
printk("%s():ERR!!! skb->len is smaller than hdrlen\n", __func__); printk(KERN_INFO "%s():ERR!!! skb->len is smaller than hdrlen\n", __func__);
return 0; return 0;
} }
if (HTCCheck(ieee, skb->data)) { if (HTCCheck(ieee, skb->data)) {
if (net_ratelimit()) if (net_ratelimit())
printk("%s: Find HTCControl!\n", __func__); printk(KERN_INFO "%s: Find HTCControl!\n", __func__);
hdrlen += 4; hdrlen += 4;
} }
...@@ -1466,12 +1457,12 @@ int rtllib_rx(struct rtllib_device *ieee, struct sk_buff *skb, ...@@ -1466,12 +1457,12 @@ int rtllib_rx(struct rtllib_device *ieee, struct sk_buff *skb,
{ {
int ret = 0; int ret = 0;
if ((NULL==ieee) || (NULL==skb) || (NULL==rx_stats)){ if ((NULL == ieee) || (NULL == skb) || (NULL == rx_stats)) {
printk(KERN_INFO "%s: Input parameters NULL!\n", __func__); printk(KERN_INFO "%s: Input parameters NULL!\n", __func__);
goto rx_dropped; goto rx_dropped;
} }
if (skb->len < 10) { if (skb->len < 10) {
printk(KERN_INFO "%s: SKB length < 10 \n", __func__); printk(KERN_INFO "%s: SKB length < 10\n", __func__);
goto rx_dropped; goto rx_dropped;
} }
...@@ -1631,7 +1622,7 @@ static int rtllib_qos_convert_ac_to_parameters(struct rtllib_qos_parameter_info ...@@ -1631,7 +1622,7 @@ static int rtllib_qos_convert_ac_to_parameters(struct rtllib_qos_parameter_info
qos_param->aifs[aci] = (ac_params->aci_aifsn) & 0x0f; qos_param->aifs[aci] = (ac_params->aci_aifsn) & 0x0f;
/* WMM spec P.11: The minimum value for AIFSN shall be 2 */ /* WMM spec P.11: The minimum value for AIFSN shall be 2 */
qos_param->aifs[aci] = (qos_param->aifs[aci] < 2) ? 2:qos_param->aifs[aci]; qos_param->aifs[aci] = (qos_param->aifs[aci] < 2) ? 2 : qos_param->aifs[aci];
qos_param->cw_min[aci] = ac_params->ecw_min_max & 0x0F; qos_param->cw_min[aci] = ac_params->ecw_min_max & 0x0F;
...@@ -1722,25 +1713,23 @@ static inline void rtllib_extract_country_ie( ...@@ -1722,25 +1713,23 @@ static inline void rtllib_extract_country_ie(
struct rtllib_device *ieee, struct rtllib_device *ieee,
struct rtllib_info_element *info_element, struct rtllib_info_element *info_element,
struct rtllib_network *network, struct rtllib_network *network,
u8 * addr2) u8 *addr2)
{ {
if (IS_DOT11D_ENABLE(ieee)) { if (IS_DOT11D_ENABLE(ieee)) {
if (info_element->len!= 0) { if (info_element->len != 0) {
memcpy(network->CountryIeBuf, info_element->data, info_element->len); memcpy(network->CountryIeBuf, info_element->data, info_element->len);
network->CountryIeLen = info_element->len; network->CountryIeLen = info_element->len;
if (!IS_COUNTRY_IE_VALID(ieee)) if (!IS_COUNTRY_IE_VALID(ieee)) {
{ if ((rtllib_act_scanning(ieee, false) == true) && (ieee->FirstIe_InScan == 1))
if ((rtllib_act_scanning(ieee,false) == true) && (ieee->FirstIe_InScan == 1)) printk(KERN_INFO "Received beacon ContryIE, SSID: <%s>\n", network->ssid);
printk("Received beacon ContryIE, SSID: <%s>\n",network->ssid);
Dot11d_UpdateCountryIe(ieee, addr2, info_element->len, info_element->data); Dot11d_UpdateCountryIe(ieee, addr2, info_element->len, info_element->data);
} }
} }
if (IS_EQUAL_CIE_SRC(ieee, addr2)) { if (IS_EQUAL_CIE_SRC(ieee, addr2))
UPDATE_CIE_WATCHDOG(ieee); UPDATE_CIE_WATCHDOG(ieee);
} }
}
} }
...@@ -1752,9 +1741,9 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, ...@@ -1752,9 +1741,9 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,
{ {
u8 i; u8 i;
short offset; short offset;
u16 tmp_htcap_len=0; u16 tmp_htcap_len = 0;
u16 tmp_htinfo_len=0; u16 tmp_htinfo_len = 0;
u16 ht_realtek_agg_len=0; u16 ht_realtek_agg_len = 0;
u8 ht_realtek_agg_buf[MAX_IE_LEN]; u8 ht_realtek_agg_buf[MAX_IE_LEN];
char rates_str[64]; char rates_str[64];
char *p; char *p;
...@@ -1879,12 +1868,12 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, ...@@ -1879,12 +1868,12 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,
if (ieee->assoc_id < 8*offset || if (ieee->assoc_id < 8*offset ||
ieee->assoc_id > 8*(offset + info_element->len -3)) ieee->assoc_id > 8*(offset + info_element->len - 3))
break; break;
offset = (ieee->assoc_id / 8) - offset; offset = (ieee->assoc_id / 8) - offset;
if (info_element->data[3+offset] & (1<<(ieee->assoc_id%8))) if (info_element->data[3 + offset] &
(1 << (ieee->assoc_id % 8)))
network->dtim_data |= RTLLIB_DTIM_UCAST; network->dtim_data |= RTLLIB_DTIM_UCAST;
network->listen_interval = network->dtim_period; network->listen_interval = network->dtim_period;
...@@ -1938,38 +1927,37 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, ...@@ -1938,38 +1927,37 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,
info_element->data[2] == 0x4c && info_element->data[2] == 0x4c &&
info_element->data[3] == 0x033) { info_element->data[3] == 0x033) {
tmp_htcap_len = min(info_element->len,(u8)MAX_IE_LEN); tmp_htcap_len = min(info_element->len, (u8)MAX_IE_LEN);
if (tmp_htcap_len != 0){ if (tmp_htcap_len != 0) {
network->bssht.bdHTSpecVer = HT_SPEC_VER_EWC; network->bssht.bdHTSpecVer = HT_SPEC_VER_EWC;
network->bssht.bdHTCapLen = tmp_htcap_len > sizeof(network->bssht.bdHTCapBuf)?\ network->bssht.bdHTCapLen = tmp_htcap_len > sizeof(network->bssht.bdHTCapBuf) ?
sizeof(network->bssht.bdHTCapBuf):tmp_htcap_len; sizeof(network->bssht.bdHTCapBuf) : tmp_htcap_len;
memcpy(network->bssht.bdHTCapBuf,info_element->data,network->bssht.bdHTCapLen); memcpy(network->bssht.bdHTCapBuf, info_element->data, network->bssht.bdHTCapLen);
} }
} }
if (tmp_htcap_len != 0){ if (tmp_htcap_len != 0) {
network->bssht.bdSupportHT = true; network->bssht.bdSupportHT = true;
network->bssht.bdHT1R = ((((struct ht_capab_ele *)(network->bssht.bdHTCapBuf))->MCS[1]) == 0); network->bssht.bdHT1R = ((((struct ht_capab_ele *)(network->bssht.bdHTCapBuf))->MCS[1]) == 0);
}else{ } else {
network->bssht.bdSupportHT = false; network->bssht.bdSupportHT = false;
network->bssht.bdHT1R = false; network->bssht.bdHT1R = false;
} }
} }
if (tmp_htinfo_len == 0){ if (tmp_htinfo_len == 0) {
if (info_element->len >= 4 && if (info_element->len >= 4 &&
info_element->data[0] == 0x00 && info_element->data[0] == 0x00 &&
info_element->data[1] == 0x90 && info_element->data[1] == 0x90 &&
info_element->data[2] == 0x4c && info_element->data[2] == 0x4c &&
info_element->data[3] == 0x034){ info_element->data[3] == 0x034) {
tmp_htinfo_len = min(info_element->len, (u8)MAX_IE_LEN);
tmp_htinfo_len = min(info_element->len,(u8)MAX_IE_LEN); if (tmp_htinfo_len != 0) {
if (tmp_htinfo_len != 0){
network->bssht.bdHTSpecVer = HT_SPEC_VER_EWC; network->bssht.bdHTSpecVer = HT_SPEC_VER_EWC;
if (tmp_htinfo_len){ if (tmp_htinfo_len) {
network->bssht.bdHTInfoLen = tmp_htinfo_len > sizeof(network->bssht.bdHTInfoBuf)?\ network->bssht.bdHTInfoLen = tmp_htinfo_len > sizeof(network->bssht.bdHTInfoBuf) ?
sizeof(network->bssht.bdHTInfoBuf):tmp_htinfo_len; sizeof(network->bssht.bdHTInfoBuf) : tmp_htinfo_len;
memcpy(network->bssht.bdHTInfoBuf,info_element->data,network->bssht.bdHTInfoLen); memcpy(network->bssht.bdHTInfoBuf, info_element->data, network->bssht.bdHTInfoLen);
} }
} }
...@@ -1977,38 +1965,33 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, ...@@ -1977,38 +1965,33 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,
} }
} }
if (ieee->aggregation){ if (ieee->aggregation) {
if (network->bssht.bdSupportHT){ if (network->bssht.bdSupportHT) {
if (info_element->len >= 4 && if (info_element->len >= 4 &&
info_element->data[0] == 0x00 && info_element->data[0] == 0x00 &&
info_element->data[1] == 0xe0 && info_element->data[1] == 0xe0 &&
info_element->data[2] == 0x4c && info_element->data[2] == 0x4c &&
info_element->data[3] == 0x02){ info_element->data[3] == 0x02) {
ht_realtek_agg_len = min(info_element->len, (u8)MAX_IE_LEN);
ht_realtek_agg_len = min(info_element->len,(u8)MAX_IE_LEN); memcpy(ht_realtek_agg_buf, info_element->data, info_element->len);
memcpy(ht_realtek_agg_buf,info_element->data,info_element->len);
} }
if (ht_realtek_agg_len >= 5){ if (ht_realtek_agg_len >= 5) {
network->realtek_cap_exit = true; network->realtek_cap_exit = true;
network->bssht.bdRT2RTAggregation = true; network->bssht.bdRT2RTAggregation = true;
if ((ht_realtek_agg_buf[4] == 1) && (ht_realtek_agg_buf[5] & 0x02)) if ((ht_realtek_agg_buf[4] == 1) && (ht_realtek_agg_buf[5] & 0x02))
network->bssht.bdRT2RTLongSlotTime = true; network->bssht.bdRT2RTLongSlotTime = true;
if ((ht_realtek_agg_buf[4]==1) && (ht_realtek_agg_buf[5] & RT_HT_CAP_USE_92SE)) if ((ht_realtek_agg_buf[4] == 1) && (ht_realtek_agg_buf[5] & RT_HT_CAP_USE_92SE))
{
network->bssht.RT2RT_HT_Mode |= RT_HT_CAP_USE_92SE; network->bssht.RT2RT_HT_Mode |= RT_HT_CAP_USE_92SE;
} }
} }
} if (ht_realtek_agg_len >= 5) {
if (ht_realtek_agg_len >= 5){
if ((ht_realtek_agg_buf[5] & RT_HT_CAP_USE_SOFTAP)) if ((ht_realtek_agg_buf[5] & RT_HT_CAP_USE_SOFTAP))
network->bssht.RT2RT_HT_Mode |= RT_HT_CAP_USE_SOFTAP; network->bssht.RT2RT_HT_Mode |= RT_HT_CAP_USE_SOFTAP;
} }
} }
{
if ((info_element->len >= 3 && if ((info_element->len >= 3 &&
info_element->data[0] == 0x00 && info_element->data[0] == 0x00 &&
info_element->data[1] == 0x05 && info_element->data[1] == 0x05 &&
...@@ -2020,19 +2003,14 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, ...@@ -2020,19 +2003,14 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,
(info_element->len >= 3 && (info_element->len >= 3 &&
info_element->data[0] == 0x00 && info_element->data[0] == 0x00 &&
info_element->data[1] == 0x10 && info_element->data[1] == 0x10 &&
info_element->data[2] == 0x18)){ info_element->data[2] == 0x18)) {
network->broadcom_cap_exist = true; network->broadcom_cap_exist = true;
}
} }
if (info_element->len >= 3 && if (info_element->len >= 3 &&
info_element->data[0] == 0x00 && info_element->data[0] == 0x00 &&
info_element->data[1] == 0x0c && info_element->data[1] == 0x0c &&
info_element->data[2] == 0x43) info_element->data[2] == 0x43)
{
network->ralink_cap_exist = true; network->ralink_cap_exist = true;
}
if ((info_element->len >= 3 && if ((info_element->len >= 3 &&
info_element->data[0] == 0x00 && info_element->data[0] == 0x00 &&
info_element->data[1] == 0x03 && info_element->data[1] == 0x03 &&
...@@ -2041,64 +2019,47 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, ...@@ -2041,64 +2019,47 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,
info_element->data[0] == 0x00 && info_element->data[0] == 0x00 &&
info_element->data[1] == 0x13 && info_element->data[1] == 0x13 &&
info_element->data[2] == 0x74)) info_element->data[2] == 0x74))
{
network->atheros_cap_exist = true; network->atheros_cap_exist = true;
}
if ((info_element->len >= 3 && if ((info_element->len >= 3 &&
info_element->data[0] == 0x00 && info_element->data[0] == 0x00 &&
info_element->data[1] == 0x50 && info_element->data[1] == 0x50 &&
info_element->data[2] == 0x43) ) info_element->data[2] == 0x43))
{
network->marvell_cap_exist = true; network->marvell_cap_exist = true;
}
if (info_element->len >= 3 && if (info_element->len >= 3 &&
info_element->data[0] == 0x00 && info_element->data[0] == 0x00 &&
info_element->data[1] == 0x40 && info_element->data[1] == 0x40 &&
info_element->data[2] == 0x96) info_element->data[2] == 0x96)
{
network->cisco_cap_exist = true; network->cisco_cap_exist = true;
}
if (info_element->len >= 3 && if (info_element->len >= 3 &&
info_element->data[0] == 0x00 && info_element->data[0] == 0x00 &&
info_element->data[1] == 0x0a && info_element->data[1] == 0x0a &&
info_element->data[2] == 0xf5) info_element->data[2] == 0xf5)
{
network->airgo_cap_exist = true; network->airgo_cap_exist = true;
}
if (info_element->len > 4 && if (info_element->len > 4 &&
info_element->data[0] == 0x00 && info_element->data[0] == 0x00 &&
info_element->data[1] == 0x40 && info_element->data[1] == 0x40 &&
info_element->data[2] == 0x96 && info_element->data[2] == 0x96 &&
info_element->data[3] == 0x01) info_element->data[3] == 0x01) {
{ if (info_element->len == 6) {
if (info_element->len == 6)
{
memcpy(network->CcxRmState, &info_element[4], 2); memcpy(network->CcxRmState, &info_element[4], 2);
if (network->CcxRmState[0] != 0) if (network->CcxRmState[0] != 0)
{
network->bCcxRmEnable = true; network->bCcxRmEnable = true;
}
else else
network->bCcxRmEnable = false; network->bCcxRmEnable = false;
network->MBssidMask = network->CcxRmState[1] & 0x07; network->MBssidMask = network->CcxRmState[1] & 0x07;
if (network->MBssidMask != 0) if (network->MBssidMask != 0) {
{
network->bMBssidValid = true; network->bMBssidValid = true;
network->MBssidMask = 0xff << (network->MBssidMask); network->MBssidMask = 0xff << (network->MBssidMask);
memcpy(network->MBssid, network->bssid, ETH_ALEN); memcpy(network->MBssid, network->bssid, ETH_ALEN);
network->MBssid[5] &= network->MBssidMask; network->MBssid[5] &= network->MBssidMask;
} } else {
else
{
network->bMBssidValid = false; network->bMBssidValid = false;
} }
} } else {
else
{
network->bCcxRmEnable = false; network->bCcxRmEnable = false;
} }
} }
...@@ -2106,15 +2067,11 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, ...@@ -2106,15 +2067,11 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,
info_element->data[0] == 0x00 && info_element->data[0] == 0x00 &&
info_element->data[1] == 0x40 && info_element->data[1] == 0x40 &&
info_element->data[2] == 0x96 && info_element->data[2] == 0x96 &&
info_element->data[3] == 0x03) info_element->data[3] == 0x03) {
{ if (info_element->len == 5) {
if (info_element->len == 5)
{
network->bWithCcxVerNum = true; network->bWithCcxVerNum = true;
network->BssCcxVerNumber = info_element->data[4]; network->BssCcxVerNumber = info_element->data[4];
} } else {
else
{
network->bWithCcxVerNum = false; network->bWithCcxVerNum = false;
network->BssCcxVerNumber = 0; network->BssCcxVerNumber = 0;
} }
...@@ -2123,8 +2080,7 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, ...@@ -2123,8 +2080,7 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,
info_element->data[0] == 0x00 && info_element->data[0] == 0x00 &&
info_element->data[1] == 0x50 && info_element->data[1] == 0x50 &&
info_element->data[2] == 0xf2 && info_element->data[2] == 0xf2 &&
info_element->data[3] == 0x04) info_element->data[3] == 0x04) {
{
RTLLIB_DEBUG_MGMT("MFIE_TYPE_WZC: %d bytes\n", RTLLIB_DEBUG_MGMT("MFIE_TYPE_WZC: %d bytes\n",
info_element->len); info_element->len);
network->wzc_ie_len = min(info_element->len+2, network->wzc_ie_len = min(info_element->len+2,
...@@ -2146,22 +2102,26 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, ...@@ -2146,22 +2102,26 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,
case MFIE_TYPE_HT_CAP: case MFIE_TYPE_HT_CAP:
RTLLIB_DEBUG_SCAN("MFIE_TYPE_HT_CAP: %d bytes\n", RTLLIB_DEBUG_SCAN("MFIE_TYPE_HT_CAP: %d bytes\n",
info_element->len); info_element->len);
tmp_htcap_len = min(info_element->len,(u8)MAX_IE_LEN); tmp_htcap_len = min(info_element->len, (u8)MAX_IE_LEN);
if (tmp_htcap_len != 0){ if (tmp_htcap_len != 0) {
network->bssht.bdHTSpecVer = HT_SPEC_VER_EWC; network->bssht.bdHTSpecVer = HT_SPEC_VER_EWC;
network->bssht.bdHTCapLen = tmp_htcap_len > sizeof(network->bssht.bdHTCapBuf)?\ network->bssht.bdHTCapLen = tmp_htcap_len > sizeof(network->bssht.bdHTCapBuf) ?
sizeof(network->bssht.bdHTCapBuf):tmp_htcap_len; sizeof(network->bssht.bdHTCapBuf) : tmp_htcap_len;
memcpy(network->bssht.bdHTCapBuf,info_element->data,network->bssht.bdHTCapLen); memcpy(network->bssht.bdHTCapBuf,
info_element->data,
network->bssht.bdHTCapLen);
network->bssht.bdSupportHT = true; network->bssht.bdSupportHT = true;
network->bssht.bdHT1R = ((((struct ht_capab_ele *)(network->bssht.bdHTCapBuf))->MCS[1]) == 0); network->bssht.bdHT1R = ((((struct ht_capab_ele *)
network->bssht.bdHTCapBuf))->MCS[1]) == 0;
network->bssht.bdBandWidth = (enum ht_channel_width)(((struct ht_capab_ele *)(network->bssht.bdHTCapBuf))->ChlWidth); network->bssht.bdBandWidth = (enum ht_channel_width)
} (((struct ht_capab_ele *)
else{ (network->bssht.bdHTCapBuf))->ChlWidth);
} else {
network->bssht.bdSupportHT = false; network->bssht.bdSupportHT = false;
network->bssht.bdHT1R = false; network->bssht.bdHT1R = false;
network->bssht.bdBandWidth = HT_CHANNEL_WIDTH_20 ; network->bssht.bdBandWidth = HT_CHANNEL_WIDTH_20;
} }
break; break;
...@@ -2169,34 +2129,33 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, ...@@ -2169,34 +2129,33 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,
case MFIE_TYPE_HT_INFO: case MFIE_TYPE_HT_INFO:
RTLLIB_DEBUG_SCAN("MFIE_TYPE_HT_INFO: %d bytes\n", RTLLIB_DEBUG_SCAN("MFIE_TYPE_HT_INFO: %d bytes\n",
info_element->len); info_element->len);
tmp_htinfo_len = min(info_element->len,(u8)MAX_IE_LEN); tmp_htinfo_len = min(info_element->len, (u8)MAX_IE_LEN);
if (tmp_htinfo_len){ if (tmp_htinfo_len) {
network->bssht.bdHTSpecVer = HT_SPEC_VER_IEEE; network->bssht.bdHTSpecVer = HT_SPEC_VER_IEEE;
network->bssht.bdHTInfoLen = tmp_htinfo_len > sizeof(network->bssht.bdHTInfoBuf)?\ network->bssht.bdHTInfoLen = tmp_htinfo_len >
sizeof(network->bssht.bdHTInfoBuf):tmp_htinfo_len; sizeof(network->bssht.bdHTInfoBuf) ?
memcpy(network->bssht.bdHTInfoBuf,info_element->data,network->bssht.bdHTInfoLen); sizeof(network->bssht.bdHTInfoBuf) :
tmp_htinfo_len;
memcpy(network->bssht.bdHTInfoBuf,
info_element->data,
network->bssht.bdHTInfoLen);
} }
break; break;
case MFIE_TYPE_AIRONET: case MFIE_TYPE_AIRONET:
RTLLIB_DEBUG_SCAN("MFIE_TYPE_AIRONET: %d bytes\n", RTLLIB_DEBUG_SCAN("MFIE_TYPE_AIRONET: %d bytes\n",
info_element->len); info_element->len);
if (info_element->len >IE_CISCO_FLAG_POSITION) if (info_element->len > IE_CISCO_FLAG_POSITION) {
{
network->bWithAironetIE = true; network->bWithAironetIE = true;
if ( (info_element->data[IE_CISCO_FLAG_POSITION]&SUPPORT_CKIP_MIC) || if ((info_element->data[IE_CISCO_FLAG_POSITION]
(info_element->data[IE_CISCO_FLAG_POSITION]&SUPPORT_CKIP_PK) ) & SUPPORT_CKIP_MIC) ||
{ (info_element->data[IE_CISCO_FLAG_POSITION]
& SUPPORT_CKIP_PK))
network->bCkipSupported = true; network->bCkipSupported = true;
}
else else
{
network->bCkipSupported = false; network->bCkipSupported = false;
} } else {
}
else
{
network->bWithAironetIE = false; network->bWithAironetIE = false;
network->bCkipSupported = false; network->bCkipSupported = false;
} }
...@@ -2209,7 +2168,8 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, ...@@ -2209,7 +2168,8 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,
case MFIE_TYPE_COUNTRY: case MFIE_TYPE_COUNTRY:
RTLLIB_DEBUG_SCAN("MFIE_TYPE_COUNTRY: %d bytes\n", RTLLIB_DEBUG_SCAN("MFIE_TYPE_COUNTRY: %d bytes\n",
info_element->len); info_element->len);
rtllib_extract_country_ie(ieee, info_element, network, network->bssid); rtllib_extract_country_ie(ieee, info_element, network,
network->bssid);
break; break;
/* TODO */ /* TODO */
default: default:
...@@ -2227,70 +2187,43 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, ...@@ -2227,70 +2187,43 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,
} }
if (!network->atheros_cap_exist && !network->broadcom_cap_exist && if (!network->atheros_cap_exist && !network->broadcom_cap_exist &&
!network->cisco_cap_exist && !network->ralink_cap_exist && !network->bssht.bdRT2RTAggregation) !network->cisco_cap_exist && !network->ralink_cap_exist &&
{ !network->bssht.bdRT2RTAggregation)
network->unknown_cap_exist = true; network->unknown_cap_exist = true;
}
else else
{
network->unknown_cap_exist = false; network->unknown_cap_exist = false;
}
return 0; return 0;
} }
static inline u8 rtllib_SignalStrengthTranslate( static inline u8 rtllib_SignalStrengthTranslate(u8 CurrSS)
u8 CurrSS
)
{ {
u8 RetSS; u8 RetSS;
if (CurrSS >= 71 && CurrSS <= 100) if (CurrSS >= 71 && CurrSS <= 100)
{
RetSS = 90 + ((CurrSS - 70) / 3); RetSS = 90 + ((CurrSS - 70) / 3);
}
else if (CurrSS >= 41 && CurrSS <= 70) else if (CurrSS >= 41 && CurrSS <= 70)
{
RetSS = 78 + ((CurrSS - 40) / 3); RetSS = 78 + ((CurrSS - 40) / 3);
}
else if (CurrSS >= 31 && CurrSS <= 40) else if (CurrSS >= 31 && CurrSS <= 40)
{
RetSS = 66 + (CurrSS - 30); RetSS = 66 + (CurrSS - 30);
}
else if (CurrSS >= 21 && CurrSS <= 30) else if (CurrSS >= 21 && CurrSS <= 30)
{
RetSS = 54 + (CurrSS - 20); RetSS = 54 + (CurrSS - 20);
}
else if (CurrSS >= 5 && CurrSS <= 20) else if (CurrSS >= 5 && CurrSS <= 20)
{
RetSS = 42 + (((CurrSS - 5) * 2) / 3); RetSS = 42 + (((CurrSS - 5) * 2) / 3);
}
else if (CurrSS == 4) else if (CurrSS == 4)
{
RetSS = 36; RetSS = 36;
}
else if (CurrSS == 3) else if (CurrSS == 3)
{
RetSS = 27; RetSS = 27;
}
else if (CurrSS == 2) else if (CurrSS == 2)
{
RetSS = 18; RetSS = 18;
}
else if (CurrSS == 1) else if (CurrSS == 1)
{
RetSS = 9; RetSS = 9;
}
else else
{
RetSS = CurrSS; RetSS = CurrSS;
}
return RetSS; return RetSS;
} }
long rtllib_translate_todbm(u8 signal_strength_index ) long rtllib_translate_todbm(u8 signal_strength_index)
{ {
long signal_power; long signal_power;
...@@ -2384,7 +2317,7 @@ static inline int rtllib_network_init( ...@@ -2384,7 +2317,7 @@ static inline int rtllib_network_init(
return 1; return 1;
} }
if (network->bssht.bdSupportHT){ if (network->bssht.bdSupportHT) {
if (network->mode == IEEE_A) if (network->mode == IEEE_A)
network->mode = IEEE_N_5G; network->mode = IEEE_N_5G;
else if (network->mode & (IEEE_G | IEEE_B)) else if (network->mode & (IEEE_G | IEEE_B))
...@@ -2393,7 +2326,7 @@ static inline int rtllib_network_init( ...@@ -2393,7 +2326,7 @@ static inline int rtllib_network_init(
if (rtllib_is_empty_essid(network->ssid, network->ssid_len)) if (rtllib_is_empty_essid(network->ssid, network->ssid_len))
network->flags |= NETWORK_EMPTY_ESSID; network->flags |= NETWORK_EMPTY_ESSID;
stats->signal = 30 + (stats->SignalStrength * 70) / 100; stats->signal = 30 + (stats->SignalStrength * 70) / 100;
stats->noise = rtllib_translate_todbm((u8)(100-stats->signal)) -25; stats->noise = rtllib_translate_todbm((u8)(100-stats->signal)) - 25;
memcpy(&network->stats, stats, sizeof(network->stats)); memcpy(&network->stats, stats, sizeof(network->stats));
...@@ -2407,11 +2340,11 @@ static inline int is_same_network(struct rtllib_network *src, ...@@ -2407,11 +2340,11 @@ static inline int is_same_network(struct rtllib_network *src,
* and the capability field (in particular IBSS and BSS) all match. * and the capability field (in particular IBSS and BSS) all match.
* We treat all <hidden> with the same BSSID and channel * We treat all <hidden> with the same BSSID and channel
* as one network */ * as one network */
return return (((src->ssid_len == dst->ssid_len) || (!ssidbroad)) &&
(((src->ssid_len == dst->ssid_len) || (!ssidbroad)) &&
(src->channel == dst->channel) && (src->channel == dst->channel) &&
!memcmp(src->bssid, dst->bssid, ETH_ALEN) && !memcmp(src->bssid, dst->bssid, ETH_ALEN) &&
(!memcmp(src->ssid, dst->ssid, src->ssid_len) || (!ssidbroad)) && (!memcmp(src->ssid, dst->ssid, src->ssid_len) ||
(!ssidbroad)) &&
((src->capability & WLAN_CAPABILITY_IBSS) == ((src->capability & WLAN_CAPABILITY_IBSS) ==
(dst->capability & WLAN_CAPABILITY_IBSS)) && (dst->capability & WLAN_CAPABILITY_IBSS)) &&
((src->capability & WLAN_CAPABILITY_ESS) == ((src->capability & WLAN_CAPABILITY_ESS) ==
...@@ -2438,14 +2371,12 @@ static inline void update_network(struct rtllib_network *dst, ...@@ -2438,14 +2371,12 @@ static inline void update_network(struct rtllib_network *dst,
dst->rates_len = src->rates_len; dst->rates_len = src->rates_len;
memcpy(dst->rates_ex, src->rates_ex, src->rates_ex_len); memcpy(dst->rates_ex, src->rates_ex, src->rates_ex_len);
dst->rates_ex_len = src->rates_ex_len; dst->rates_ex_len = src->rates_ex_len;
if (src->ssid_len > 0) if (src->ssid_len > 0) {
{ if (dst->ssid_len == 0) {
if (dst->ssid_len == 0)
{
memset(dst->hidden_ssid, 0, sizeof(dst->hidden_ssid)); memset(dst->hidden_ssid, 0, sizeof(dst->hidden_ssid));
dst->hidden_ssid_len = src->ssid_len; dst->hidden_ssid_len = src->ssid_len;
memcpy(dst->hidden_ssid, src->ssid, src->ssid_len); memcpy(dst->hidden_ssid, src->ssid, src->ssid_len);
}else{ } else {
memset(dst->ssid, 0, dst->ssid_len); memset(dst->ssid, 0, dst->ssid_len);
dst->ssid_len = src->ssid_len; dst->ssid_len = src->ssid_len;
memcpy(dst->ssid, src->ssid, src->ssid_len); memcpy(dst->ssid, src->ssid, src->ssid_len);
...@@ -2455,8 +2386,7 @@ static inline void update_network(struct rtllib_network *dst, ...@@ -2455,8 +2386,7 @@ static inline void update_network(struct rtllib_network *dst,
dst->flags = src->flags; dst->flags = src->flags;
dst->time_stamp[0] = src->time_stamp[0]; dst->time_stamp[0] = src->time_stamp[0];
dst->time_stamp[1] = src->time_stamp[1]; dst->time_stamp[1] = src->time_stamp[1];
if (src->flags & NETWORK_HAS_ERP_VALUE) if (src->flags & NETWORK_HAS_ERP_VALUE) {
{
dst->erp_value = src->erp_value; dst->erp_value = src->erp_value;
dst->berp_info_valid = src->berp_info_valid = true; dst->berp_info_valid = src->berp_info_valid = true;
} }
...@@ -2470,10 +2400,12 @@ static inline void update_network(struct rtllib_network *dst, ...@@ -2470,10 +2400,12 @@ static inline void update_network(struct rtllib_network *dst,
dst->bssht.bdSupportHT = src->bssht.bdSupportHT; dst->bssht.bdSupportHT = src->bssht.bdSupportHT;
dst->bssht.bdRT2RTAggregation = src->bssht.bdRT2RTAggregation; dst->bssht.bdRT2RTAggregation = src->bssht.bdRT2RTAggregation;
dst->bssht.bdHTCapLen= src->bssht.bdHTCapLen; dst->bssht.bdHTCapLen = src->bssht.bdHTCapLen;
memcpy(dst->bssht.bdHTCapBuf,src->bssht.bdHTCapBuf,src->bssht.bdHTCapLen); memcpy(dst->bssht.bdHTCapBuf, src->bssht.bdHTCapBuf,
dst->bssht.bdHTInfoLen= src->bssht.bdHTInfoLen; src->bssht.bdHTCapLen);
memcpy(dst->bssht.bdHTInfoBuf,src->bssht.bdHTInfoBuf,src->bssht.bdHTInfoLen); dst->bssht.bdHTInfoLen = src->bssht.bdHTInfoLen;
memcpy(dst->bssht.bdHTInfoBuf, src->bssht.bdHTInfoBuf,
src->bssht.bdHTInfoLen);
dst->bssht.bdHTSpecVer = src->bssht.bdHTSpecVer; dst->bssht.bdHTSpecVer = src->bssht.bdHTSpecVer;
dst->bssht.bdRT2RTLongSlotTime = src->bssht.bdRT2RTLongSlotTime; dst->bssht.bdRT2RTLongSlotTime = src->bssht.bdRT2RTLongSlotTime;
dst->broadcom_cap_exist = src->broadcom_cap_exist; dst->broadcom_cap_exist = src->broadcom_cap_exist;
...@@ -2497,7 +2429,8 @@ static inline void update_network(struct rtllib_network *dst, ...@@ -2497,7 +2429,8 @@ static inline void update_network(struct rtllib_network *dst,
old_param = dst->qos_data.param_count; old_param = dst->qos_data.param_count;
dst->qos_data.supported = src->qos_data.supported; dst->qos_data.supported = src->qos_data.supported;
if (dst->flags & NETWORK_HAS_QOS_PARAMETERS) if (dst->flags & NETWORK_HAS_QOS_PARAMETERS)
memcpy(&dst->qos_data, &src->qos_data, sizeof(struct rtllib_qos_data)); memcpy(&dst->qos_data, &src->qos_data,
sizeof(struct rtllib_qos_data));
if (dst->qos_data.supported == 1) { if (dst->qos_data.supported == 1) {
if (dst->ssid_len) if (dst->ssid_len)
RTLLIB_DEBUG_QOS RTLLIB_DEBUG_QOS
...@@ -2512,12 +2445,11 @@ static inline void update_network(struct rtllib_network *dst, ...@@ -2512,12 +2445,11 @@ static inline void update_network(struct rtllib_network *dst,
/* dst->last_associate is not overwritten */ /* dst->last_associate is not overwritten */
dst->wmm_info = src->wmm_info; dst->wmm_info = src->wmm_info;
if (src->wmm_param[0].ac_aci_acm_aifsn|| \ if (src->wmm_param[0].ac_aci_acm_aifsn ||
src->wmm_param[1].ac_aci_acm_aifsn|| \ src->wmm_param[1].ac_aci_acm_aifsn ||
src->wmm_param[2].ac_aci_acm_aifsn|| \ src->wmm_param[2].ac_aci_acm_aifsn ||
src->wmm_param[1].ac_aci_acm_aifsn) { src->wmm_param[1].ac_aci_acm_aifsn)
memcpy(dst->wmm_param, src->wmm_param, WME_AC_PRAM_LEN); memcpy(dst->wmm_param, src->wmm_param, WME_AC_PRAM_LEN);
}
dst->SignalStrength = src->SignalStrength; dst->SignalStrength = src->SignalStrength;
dst->RSSI = src->RSSI; dst->RSSI = src->RSSI;
...@@ -2528,24 +2460,24 @@ static inline void update_network(struct rtllib_network *dst, ...@@ -2528,24 +2460,24 @@ static inline void update_network(struct rtllib_network *dst,
dst->bWithAironetIE = src->bWithAironetIE; dst->bWithAironetIE = src->bWithAironetIE;
dst->bCkipSupported = src->bCkipSupported; dst->bCkipSupported = src->bCkipSupported;
memcpy(dst->CcxRmState,src->CcxRmState,2); memcpy(dst->CcxRmState, src->CcxRmState, 2);
dst->bCcxRmEnable = src->bCcxRmEnable; dst->bCcxRmEnable = src->bCcxRmEnable;
dst->MBssidMask = src->MBssidMask; dst->MBssidMask = src->MBssidMask;
dst->bMBssidValid = src->bMBssidValid; dst->bMBssidValid = src->bMBssidValid;
memcpy(dst->MBssid,src->MBssid,6); memcpy(dst->MBssid, src->MBssid, 6);
dst->bWithCcxVerNum = src->bWithCcxVerNum; dst->bWithCcxVerNum = src->bWithCcxVerNum;
dst->BssCcxVerNumber = src->BssCcxVerNumber; dst->BssCcxVerNumber = src->BssCcxVerNumber;
} }
static inline int is_beacon(__le16 fc) static inline int is_beacon(__le16 fc)
{ {
return (WLAN_FC_GET_STYPE(le16_to_cpu(fc)) == RTLLIB_STYPE_BEACON); return (WLAN_FC_GET_STYPE(le16_to_cpu(fc)) == RTLLIB_STYPE_BEACON);
} }
static int IsPassiveChannel( struct rtllib_device *rtllib, u8 channel) static int IsPassiveChannel(struct rtllib_device *rtllib, u8 channel)
{ {
if (MAX_CHANNEL_NUMBER < channel) { if (MAX_CHANNEL_NUMBER < channel) {
printk("%s(): Invalid Channel\n", __func__); printk(KERN_INFO "%s(): Invalid Channel\n", __func__);
return 0; return 0;
} }
...@@ -2555,10 +2487,10 @@ static int IsPassiveChannel( struct rtllib_device *rtllib, u8 channel) ...@@ -2555,10 +2487,10 @@ static int IsPassiveChannel( struct rtllib_device *rtllib, u8 channel)
return 0; return 0;
} }
int IsLegalChannel( struct rtllib_device *rtllib, u8 channel) int IsLegalChannel(struct rtllib_device *rtllib, u8 channel)
{ {
if (MAX_CHANNEL_NUMBER < channel) { if (MAX_CHANNEL_NUMBER < channel) {
printk("%s(): Invalid Channel\n", __func__); printk(KERN_INFO "%s(): Invalid Channel\n", __func__);
return 0; return 0;
} }
if (rtllib->active_channel_map[channel] > 0) if (rtllib->active_channel_map[channel] > 0)
...@@ -2567,7 +2499,6 @@ int IsLegalChannel( struct rtllib_device *rtllib, u8 channel) ...@@ -2567,7 +2499,6 @@ int IsLegalChannel( struct rtllib_device *rtllib, u8 channel)
return 0; return 0;
} }
static inline void rtllib_process_probe_response( static inline void rtllib_process_probe_response(
struct rtllib_device *ieee, struct rtllib_device *ieee,
struct rtllib_probe_response *beacon, struct rtllib_probe_response *beacon,
...@@ -2578,7 +2509,8 @@ static inline void rtllib_process_probe_response( ...@@ -2578,7 +2509,8 @@ static inline void rtllib_process_probe_response(
struct rtllib_info_element *info_element = &beacon->info_element[0]; struct rtllib_info_element *info_element = &beacon->info_element[0];
unsigned long flags; unsigned long flags;
short renew; short renew;
struct rtllib_network *network = kzalloc(sizeof(struct rtllib_network), GFP_ATOMIC); struct rtllib_network *network = kzalloc(sizeof(struct rtllib_network),
GFP_ATOMIC);
if (!network) if (!network)
return; return;
...@@ -2619,10 +2551,12 @@ static inline void rtllib_process_probe_response( ...@@ -2619,10 +2551,12 @@ static inline void rtllib_process_probe_response(
if (!IsLegalChannel(ieee, network->channel)) if (!IsLegalChannel(ieee, network->channel))
goto free_network; goto free_network;
if (WLAN_FC_GET_STYPE(beacon->header.frame_ctl) == RTLLIB_STYPE_PROBE_RESP) { if (WLAN_FC_GET_STYPE(beacon->header.frame_ctl) ==
RTLLIB_STYPE_PROBE_RESP) {
if (IsPassiveChannel(ieee, network->channel)) { if (IsPassiveChannel(ieee, network->channel)) {
printk("GetScanInfo(): For Global Domain, " printk(KERN_INFO "GetScanInfo(): For Global Domain, "
"filter probe response at channel(%d).\n", network->channel); "filter probe response at channel(%d).\n",
network->channel);
goto free_network; goto free_network;
} }
} }
...@@ -2638,25 +2572,25 @@ static inline void rtllib_process_probe_response( ...@@ -2638,25 +2572,25 @@ static inline void rtllib_process_probe_response(
* already there. */ * already there. */
spin_lock_irqsave(&ieee->lock, flags); spin_lock_irqsave(&ieee->lock, flags);
{ if (is_same_network(&ieee->current_network, network,
if (is_same_network(&ieee->current_network, network, (network->ssid_len?1:0))) { (network->ssid_len ? 1 : 0))) {
update_network(&ieee->current_network, network); update_network(&ieee->current_network, network);
if ((ieee->current_network.mode == IEEE_N_24G || ieee->current_network.mode == IEEE_G) if ((ieee->current_network.mode == IEEE_N_24G ||
&& ieee->current_network.berp_info_valid){ ieee->current_network.mode == IEEE_G)
if (ieee->current_network.erp_value& ERP_UseProtection) && ieee->current_network.berp_info_valid) {
if (ieee->current_network.erp_value & ERP_UseProtection)
ieee->current_network.buseprotection = true; ieee->current_network.buseprotection = true;
else else
ieee->current_network.buseprotection = false; ieee->current_network.buseprotection = false;
} }
if (is_beacon(beacon->header.frame_ctl)) if (is_beacon(beacon->header.frame_ctl)) {
{
if (ieee->state >= RTLLIB_LINKED) if (ieee->state >= RTLLIB_LINKED)
ieee->LinkDetectInfo.NumRecvBcnInPeriod++; ieee->LinkDetectInfo.NumRecvBcnInPeriod++;
} }
} }
}
list_for_each_entry(target, &ieee->network_list, list) { list_for_each_entry(target, &ieee->network_list, list) {
if (is_same_network(target, network,(target->ssid_len?1:0))) if (is_same_network(target, network,
(target->ssid_len ? 1 : 0)))
break; break;
if ((oldest == NULL) || if ((oldest == NULL) ||
(target->last_scanned < oldest->last_scanned)) (target->last_scanned < oldest->last_scanned))
...@@ -2703,30 +2637,32 @@ static inline void rtllib_process_probe_response( ...@@ -2703,30 +2637,32 @@ static inline void rtllib_process_probe_response(
RTLLIB_STYPE_PROBE_RESP ? RTLLIB_STYPE_PROBE_RESP ?
"PROBE RESPONSE" : "BEACON"); "PROBE RESPONSE" : "BEACON");
/* we have an entry and we are going to update it. But this entry may /* we have an entry and we are going to update it. But this
* be already expired. In this case we do the same as we found a new * entry may be already expired. In this case we do the same
* net and call the new_net handler * as we found a new net and call the new_net handler
*/ */
renew = !time_after(target->last_scanned + ieee->scan_age, jiffies); renew = !time_after(target->last_scanned + ieee->scan_age,
jiffies);
if ((!target->ssid_len) && if ((!target->ssid_len) &&
(((network->ssid_len > 0) && (target->hidden_ssid_len == 0)) (((network->ssid_len > 0) && (target->hidden_ssid_len == 0))
|| ((ieee->current_network.ssid_len == network->ssid_len) && || ((ieee->current_network.ssid_len == network->ssid_len) &&
(strncmp(ieee->current_network.ssid, network->ssid, network->ssid_len) == 0) && (strncmp(ieee->current_network.ssid, network->ssid,
(ieee->state == RTLLIB_NOLINK))) network->ssid_len) == 0) &&
) { (ieee->state == RTLLIB_NOLINK))))
renew = 1; renew = 1;
}
update_network(target, network); update_network(target, network);
if (renew && (ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE)) if (renew && (ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE))
rtllib_softmac_new_net(ieee, network); rtllib_softmac_new_net(ieee, network);
} }
spin_unlock_irqrestore(&ieee->lock, flags); spin_unlock_irqrestore(&ieee->lock, flags);
if (is_beacon(beacon->header.frame_ctl)&&is_same_network(&ieee->current_network, network, (network->ssid_len?1:0))&&\ if (is_beacon(beacon->header.frame_ctl) &&
is_same_network(&ieee->current_network, network,
(network->ssid_len ? 1 : 0)) &&
(ieee->state == RTLLIB_LINKED)) { (ieee->state == RTLLIB_LINKED)) {
if (ieee->handle_beacon != NULL) { if (ieee->handle_beacon != NULL)
ieee->handle_beacon(ieee->dev,beacon,&ieee->current_network); ieee->handle_beacon(ieee->dev, beacon,
} &ieee->current_network);
} }
free_network: free_network:
kfree(network); kfree(network);
...@@ -2738,6 +2674,7 @@ void rtllib_rx_mgt(struct rtllib_device *ieee, ...@@ -2738,6 +2674,7 @@ void rtllib_rx_mgt(struct rtllib_device *ieee,
struct rtllib_rx_stats *stats) struct rtllib_rx_stats *stats)
{ {
struct rtllib_hdr_4addr *header = (struct rtllib_hdr_4addr *)skb->data ; struct rtllib_hdr_4addr *header = (struct rtllib_hdr_4addr *)skb->data ;
if (WLAN_FC_GET_STYPE(header->frame_ctl) != RTLLIB_STYPE_PROBE_RESP && if (WLAN_FC_GET_STYPE(header->frame_ctl) != RTLLIB_STYPE_PROBE_RESP &&
WLAN_FC_GET_STYPE(header->frame_ctl) != RTLLIB_STYPE_BEACON) WLAN_FC_GET_STYPE(header->frame_ctl) != RTLLIB_STYPE_BEACON)
ieee->last_rx_ps_time = jiffies; ieee->last_rx_ps_time = jiffies;
...@@ -2749,7 +2686,8 @@ void rtllib_rx_mgt(struct rtllib_device *ieee, ...@@ -2749,7 +2686,8 @@ void rtllib_rx_mgt(struct rtllib_device *ieee,
WLAN_FC_GET_STYPE(header->frame_ctl)); WLAN_FC_GET_STYPE(header->frame_ctl));
RTLLIB_DEBUG_SCAN("Beacon\n"); RTLLIB_DEBUG_SCAN("Beacon\n");
rtllib_process_probe_response( rtllib_process_probe_response(
ieee, (struct rtllib_probe_response *)header, stats); ieee, (struct rtllib_probe_response *)header,
stats);
if (ieee->sta_sleep || (ieee->ps != RTLLIB_PS_DISABLED && if (ieee->sta_sleep || (ieee->ps != RTLLIB_PS_DISABLED &&
ieee->iw_mode == IW_MODE_INFRA && ieee->iw_mode == IW_MODE_INFRA &&
...@@ -2762,8 +2700,8 @@ void rtllib_rx_mgt(struct rtllib_device *ieee, ...@@ -2762,8 +2700,8 @@ void rtllib_rx_mgt(struct rtllib_device *ieee,
RTLLIB_DEBUG_MGMT("received PROBE RESPONSE (%d)\n", RTLLIB_DEBUG_MGMT("received PROBE RESPONSE (%d)\n",
WLAN_FC_GET_STYPE(header->frame_ctl)); WLAN_FC_GET_STYPE(header->frame_ctl));
RTLLIB_DEBUG_SCAN("Probe response\n"); RTLLIB_DEBUG_SCAN("Probe response\n");
rtllib_process_probe_response( rtllib_process_probe_response(ieee,
ieee, (struct rtllib_probe_response *)header, stats); (struct rtllib_probe_response *)header, stats);
break; break;
case RTLLIB_STYPE_PROBE_REQ: case RTLLIB_STYPE_PROBE_REQ:
RTLLIB_DEBUG_MGMT("received PROBE RESQUEST (%d)\n", RTLLIB_DEBUG_MGMT("received PROBE RESQUEST (%d)\n",
...@@ -2772,10 +2710,8 @@ void rtllib_rx_mgt(struct rtllib_device *ieee, ...@@ -2772,10 +2710,8 @@ void rtllib_rx_mgt(struct rtllib_device *ieee,
if ((ieee->softmac_features & IEEE_SOFTMAC_PROBERS) && if ((ieee->softmac_features & IEEE_SOFTMAC_PROBERS) &&
((ieee->iw_mode == IW_MODE_ADHOC || ((ieee->iw_mode == IW_MODE_ADHOC ||
ieee->iw_mode == IW_MODE_MASTER) && ieee->iw_mode == IW_MODE_MASTER) &&
ieee->state == RTLLIB_LINKED)){ ieee->state == RTLLIB_LINKED))
rtllib_rx_probe_rq(ieee, skb); rtllib_rx_probe_rq(ieee, skb);
}
break; break;
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7