|
@@ -108,17 +108,17 @@ ieee80211_frag_cache_get(struct ieee80211_device *ieee,
|
|
|
u8 tid;
|
|
|
|
|
|
if (((fc & IEEE80211_FCTL_DSTODS) == IEEE80211_FCTL_DSTODS)&&IEEE80211_QOS_HAS_SEQ(fc)) {
|
|
|
- hdr_4addrqos = (struct ieee80211_hdr_4addrqos *)hdr;
|
|
|
- tid = le16_to_cpu(hdr_4addrqos->qos_ctl) & IEEE80211_QOS_TID;
|
|
|
- tid = UP2AC(tid);
|
|
|
- tid ++;
|
|
|
+ hdr_4addrqos = (struct ieee80211_hdr_4addrqos *)hdr;
|
|
|
+ tid = le16_to_cpu(hdr_4addrqos->qos_ctl) & IEEE80211_QOS_TID;
|
|
|
+ tid = UP2AC(tid);
|
|
|
+ tid ++;
|
|
|
} else if (IEEE80211_QOS_HAS_SEQ(fc)) {
|
|
|
- hdr_3addrqos = (struct ieee80211_hdr_3addrqos *)hdr;
|
|
|
- tid = le16_to_cpu(hdr_3addrqos->qos_ctl) & IEEE80211_QOS_TID;
|
|
|
- tid = UP2AC(tid);
|
|
|
- tid ++;
|
|
|
+ hdr_3addrqos = (struct ieee80211_hdr_3addrqos *)hdr;
|
|
|
+ tid = le16_to_cpu(hdr_3addrqos->qos_ctl) & IEEE80211_QOS_TID;
|
|
|
+ tid = UP2AC(tid);
|
|
|
+ tid ++;
|
|
|
} else {
|
|
|
- tid = 0;
|
|
|
+ tid = 0;
|
|
|
}
|
|
|
|
|
|
if (frag == 0) {
|
|
@@ -175,17 +175,17 @@ static int ieee80211_frag_cache_invalidate(struct ieee80211_device *ieee,
|
|
|
u8 tid;
|
|
|
|
|
|
if(((fc & IEEE80211_FCTL_DSTODS) == IEEE80211_FCTL_DSTODS)&&IEEE80211_QOS_HAS_SEQ(fc)) {
|
|
|
- hdr_4addrqos = (struct ieee80211_hdr_4addrqos *)hdr;
|
|
|
- tid = le16_to_cpu(hdr_4addrqos->qos_ctl) & IEEE80211_QOS_TID;
|
|
|
- tid = UP2AC(tid);
|
|
|
- tid ++;
|
|
|
+ hdr_4addrqos = (struct ieee80211_hdr_4addrqos *)hdr;
|
|
|
+ tid = le16_to_cpu(hdr_4addrqos->qos_ctl) & IEEE80211_QOS_TID;
|
|
|
+ tid = UP2AC(tid);
|
|
|
+ tid ++;
|
|
|
} else if (IEEE80211_QOS_HAS_SEQ(fc)) {
|
|
|
- hdr_3addrqos = (struct ieee80211_hdr_3addrqos *)hdr;
|
|
|
- tid = le16_to_cpu(hdr_3addrqos->qos_ctl) & IEEE80211_QOS_TID;
|
|
|
- tid = UP2AC(tid);
|
|
|
- tid ++;
|
|
|
+ hdr_3addrqos = (struct ieee80211_hdr_3addrqos *)hdr;
|
|
|
+ tid = le16_to_cpu(hdr_3addrqos->qos_ctl) & IEEE80211_QOS_TID;
|
|
|
+ tid = UP2AC(tid);
|
|
|
+ tid ++;
|
|
|
} else {
|
|
|
- tid = 0;
|
|
|
+ tid = 0;
|
|
|
}
|
|
|
|
|
|
entry = ieee80211_frag_cache_find(ieee, seq, -1, tid,hdr->addr2,
|
|
@@ -382,17 +382,17 @@ static int is_duplicate_packet(struct ieee80211_device *ieee,
|
|
|
|
|
|
//TO2DS and QoS
|
|
|
if(((fc & IEEE80211_FCTL_DSTODS) == IEEE80211_FCTL_DSTODS)&&IEEE80211_QOS_HAS_SEQ(fc)) {
|
|
|
- hdr_4addrqos = (struct ieee80211_hdr_4addrqos *)header;
|
|
|
- tid = le16_to_cpu(hdr_4addrqos->qos_ctl) & IEEE80211_QOS_TID;
|
|
|
- tid = UP2AC(tid);
|
|
|
- tid ++;
|
|
|
+ hdr_4addrqos = (struct ieee80211_hdr_4addrqos *)header;
|
|
|
+ tid = le16_to_cpu(hdr_4addrqos->qos_ctl) & IEEE80211_QOS_TID;
|
|
|
+ tid = UP2AC(tid);
|
|
|
+ tid ++;
|
|
|
} else if(IEEE80211_QOS_HAS_SEQ(fc)) { //QoS
|
|
|
- hdr_3addrqos = (struct ieee80211_hdr_3addrqos *)header;
|
|
|
- tid = le16_to_cpu(hdr_3addrqos->qos_ctl) & IEEE80211_QOS_TID;
|
|
|
- tid = UP2AC(tid);
|
|
|
- tid ++;
|
|
|
+ hdr_3addrqos = (struct ieee80211_hdr_3addrqos *)header;
|
|
|
+ tid = le16_to_cpu(hdr_3addrqos->qos_ctl) & IEEE80211_QOS_TID;
|
|
|
+ tid = UP2AC(tid);
|
|
|
+ tid ++;
|
|
|
} else { // no QoS
|
|
|
- tid = 0;
|
|
|
+ tid = 0;
|
|
|
}
|
|
|
switch (ieee->iw_mode) {
|
|
|
case IW_MODE_ADHOC:
|
|
@@ -1309,7 +1309,7 @@ inline void update_network(struct ieee80211_network *dst,
|
|
|
src->wmm_param[1].ac_aci_acm_aifsn|| \
|
|
|
src->wmm_param[2].ac_aci_acm_aifsn|| \
|
|
|
src->wmm_param[3].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->QoS_Enable = src->QoS_Enable;
|
|
|
#else
|