redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

[MAC80211]: Remove bitfields from struct ieee80211_txrx_data

Browse source 
mac80211, remove bitfields from struct ieee80211_txrx_data

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Slaby 2007-08-28 17:01:54 -04:00 committed by David S. Miller
parent e8bf96495c
commit badffb725c
4 changed files with 78 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
net/mac80211/ieee80211_i.h
View file

@ -113,6 +113,15 @@ typedef enum {
TXRX_CONTINUE, TXRX_DROP, TXRX_QUEUED TXRX_CONTINUE, TXRX_DROP, TXRX_QUEUED
} ieee80211_txrx_result; } ieee80211_txrx_result;
/* flags used in struct ieee80211_txrx_data.flags */
/* whether the MSDU was fragmented */
#define IEEE80211_TXRXD_FRAGMENTED BIT(0)
#define IEEE80211_TXRXD_TXUNICAST BIT(1)
#define IEEE80211_TXRXD_TXPS_BUFFERED BIT(2)
#define IEEE80211_TXRXD_TXPROBE_LAST_FRAG BIT(3)
#define IEEE80211_TXRXD_RXIN_SCAN BIT(4)
/* frame is destined to interface currently processed (incl. multicast frames) */
#define IEEE80211_TXRXD_RXRA_MATCH BIT(5)
struct ieee80211_txrx_data { struct ieee80211_txrx_data {
struct sk_buff *skb; struct sk_buff *skb;
struct net_device *dev; struct net_device *dev;
@ -121,13 +130,10 @@ struct ieee80211_txrx_data {
struct sta_info *sta; struct sta_info *sta;
u16 fc, ethertype; u16 fc, ethertype;
struct ieee80211_key *key; struct ieee80211_key *key;
unsigned int fragmented:1; /* whether the MSDU was fragmented */ unsigned int flags;
union { union {
struct { struct {
struct ieee80211_tx_control *control; struct ieee80211_tx_control *control;
unsigned int unicast:1;
unsigned int ps_buffered:1;
unsigned int probe_last_frag:1;
struct ieee80211_hw_mode *mode; struct ieee80211_hw_mode *mode;
struct ieee80211_rate *rate; struct ieee80211_rate *rate;
/* use this rate (if set) for last fragment; rate can /* use this rate (if set) for last fragment; rate can
@ -147,10 +153,6 @@ struct ieee80211_txrx_data {
int sent_ps_buffered; int sent_ps_buffered;
int queue; int queue;
int load; int load;
unsigned int in_scan:1;
/* frame is destined to interface currently processed
* (including multicast frames) */
unsigned int ra_match:1;
} rx; } rx;
} u; } u;
}; };
@ -176,7 +178,7 @@ struct ieee80211_tx_stored_packet {
int last_frag_rateidx; int last_frag_rateidx;
int last_frag_hwrate; int last_frag_hwrate;
struct ieee80211_rate *last_frag_rate; struct ieee80211_rate *last_frag_rate;
unsigned int last_frag_rate_ctrl_probe:1; unsigned int last_frag_rate_ctrl_probe;
}; };
typedef ieee80211_txrx_result (*ieee80211_tx_handler) typedef ieee80211_txrx_result (*ieee80211_tx_handler)

52
net/mac80211/rx.c
View file

@ -221,7 +221,7 @@ ieee80211_rx_h_passive_scan(struct ieee80211_txrx_data *rx)
return TXRX_QUEUED; return TXRX_QUEUED;
} }
if (unlikely(rx->u.rx.in_scan)) { if (unlikely(rx->flags & IEEE80211_TXRXD_RXIN_SCAN)) {
/* scanning finished during invoking of handlers */ /* scanning finished during invoking of handlers */
I802_DEBUG_INC(local->rx_handlers_drop_passive_scan); I802_DEBUG_INC(local->rx_handlers_drop_passive_scan);
return TXRX_DROP; return TXRX_DROP;
@ -241,7 +241,7 @@ ieee80211_rx_h_check(struct ieee80211_txrx_data *rx)
if (unlikely(rx->fc & IEEE80211_FCTL_RETRY && if (unlikely(rx->fc & IEEE80211_FCTL_RETRY &&
rx->sta->last_seq_ctrl[rx->u.rx.queue] == rx->sta->last_seq_ctrl[rx->u.rx.queue] ==
hdr->seq_ctrl)) { hdr->seq_ctrl)) {
if (rx->u.rx.ra_match) { if (rx->flags & IEEE80211_TXRXD_RXRA_MATCH) {
rx->local->dot11FrameDuplicateCount++; rx->local->dot11FrameDuplicateCount++;
rx->sta->num_duplicates++; rx->sta->num_duplicates++;
} }
@ -259,7 +259,7 @@ ieee80211_rx_h_check(struct ieee80211_txrx_data *rx)
return TXRX_DROP; return TXRX_DROP;
} }
if (!rx->u.rx.ra_match) if (!(rx->flags & IEEE80211_TXRXD_RXRA_MATCH))
rx->skb->pkt_type = PACKET_OTHERHOST; rx->skb->pkt_type = PACKET_OTHERHOST;
else if (compare_ether_addr(rx->dev->dev_addr, hdr->addr1) == 0) else if (compare_ether_addr(rx->dev->dev_addr, hdr->addr1) == 0)
rx->skb->pkt_type = PACKET_HOST; rx->skb->pkt_type = PACKET_HOST;
@ -287,7 +287,7 @@ ieee80211_rx_h_check(struct ieee80211_txrx_data *rx)
if ((!(rx->fc & IEEE80211_FCTL_FROMDS) && if ((!(rx->fc & IEEE80211_FCTL_FROMDS) &&
!(rx->fc & IEEE80211_FCTL_TODS) && !(rx->fc & IEEE80211_FCTL_TODS) &&
(rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA) (rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA)
|| !rx->u.rx.ra_match) { || !(rx->flags & IEEE80211_TXRXD_RXRA_MATCH)) {
/* Drop IBSS frames and frames for other hosts /* Drop IBSS frames and frames for other hosts
* silently. */ * silently. */
return TXRX_DROP; return TXRX_DROP;
@ -338,7 +338,7 @@ ieee80211_rx_h_load_key(struct ieee80211_txrx_data *rx)
* No point in finding a key if the frame is neither * No point in finding a key if the frame is neither
* addressed to us nor a multicast frame. * addressed to us nor a multicast frame.
*/ */
if (!rx->u.rx.ra_match) if (!(rx->flags & IEEE80211_TXRXD_RXRA_MATCH))
return TXRX_CONTINUE; return TXRX_CONTINUE;
if (!is_multicast_ether_addr(hdr->addr1) && rx->sta && rx->sta->key) { if (!is_multicast_ether_addr(hdr->addr1) && rx->sta && rx->sta->key) {
@ -480,7 +480,7 @@ ieee80211_rx_h_sta_process(struct ieee80211_txrx_data *rx)
sta->last_rx = jiffies; sta->last_rx = jiffies;
} }
if (!rx->u.rx.ra_match) if (!(rx->flags & IEEE80211_TXRXD_RXRA_MATCH))
return TXRX_CONTINUE; return TXRX_CONTINUE;
sta->rx_fragments++; sta->rx_fragments++;
@ -522,7 +522,8 @@ ieee80211_rx_h_wep_weak_iv_detection(struct ieee80211_txrx_data *rx)
{ {
if (!rx->sta || !(rx->fc & IEEE80211_FCTL_PROTECTED) || if (!rx->sta || !(rx->fc & IEEE80211_FCTL_PROTECTED) ||
(rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA || (rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA ||
!rx->key || rx->key->alg != ALG_WEP || !rx->u.rx.ra_match) !rx->key || rx->key->alg != ALG_WEP ||
!(rx->flags & IEEE80211_TXRXD_RXRA_MATCH))
return TXRX_CONTINUE; return TXRX_CONTINUE;
/* Check for weak IVs, if hwaccel did not remove IV from the frame */ /* Check for weak IVs, if hwaccel did not remove IV from the frame */
@ -755,7 +756,7 @@ ieee80211_rx_h_defragment(struct ieee80211_txrx_data *rx)
} }
/* Complete frame has been reassembled - process it now */ /* Complete frame has been reassembled - process it now */
rx->fragmented = 1; rx->flags |= IEEE80211_TXRXD_FRAGMENTED;
out: out:
if (rx->sta) if (rx->sta)
@ -776,7 +777,7 @@ ieee80211_rx_h_ps_poll(struct ieee80211_txrx_data *rx)
if (likely(!rx->sta || if (likely(!rx->sta ||
(rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_CTL || (rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_CTL ||
(rx->fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_PSPOLL || (rx->fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_PSPOLL ||
!rx->u.rx.ra_match)) !(rx->flags & IEEE80211_TXRXD_RXRA_MATCH)))
return TXRX_CONTINUE; return TXRX_CONTINUE;
skb = skb_dequeue(&rx->sta->tx_filtered); skb = skb_dequeue(&rx->sta->tx_filtered);
@ -860,7 +861,8 @@ static ieee80211_txrx_result
ieee80211_rx_h_802_1x_pae(struct ieee80211_txrx_data *rx) ieee80211_rx_h_802_1x_pae(struct ieee80211_txrx_data *rx)
{ {
if (rx->sdata->eapol && ieee80211_is_eapol(rx->skb) && if (rx->sdata->eapol && ieee80211_is_eapol(rx->skb) &&
rx->sdata->type != IEEE80211_IF_TYPE_STA && rx->u.rx.ra_match) { rx->sdata->type != IEEE80211_IF_TYPE_STA &&
(rx->flags & IEEE80211_TXRXD_RXRA_MATCH)) {
/* Pass both encrypted and unencrypted EAPOL frames to user /* Pass both encrypted and unencrypted EAPOL frames to user
* space for processing. */ * space for processing. */
if (!rx->local->apdev) if (!rx->local->apdev)
@ -1053,7 +1055,8 @@ ieee80211_rx_h_data(struct ieee80211_txrx_data *rx)
sdata->stats.rx_bytes += skb->len; sdata->stats.rx_bytes += skb->len;
if (local->bridge_packets && (sdata->type == IEEE80211_IF_TYPE_AP if (local->bridge_packets && (sdata->type == IEEE80211_IF_TYPE_AP
|| sdata->type == IEEE80211_IF_TYPE_VLAN) && rx->u.rx.ra_match) { || sdata->type == IEEE80211_IF_TYPE_VLAN) &&
(rx->flags & IEEE80211_TXRXD_RXRA_MATCH)) {
if (is_multicast_ether_addr(skb->data)) { if (is_multicast_ether_addr(skb->data)) {
/* send multicast frames both to higher layers in /* send multicast frames both to higher layers in
* local net stack and back to the wireless media */ * local net stack and back to the wireless media */
@ -1104,7 +1107,7 @@ ieee80211_rx_h_mgmt(struct ieee80211_txrx_data *rx)
{ {
struct ieee80211_sub_if_data *sdata; struct ieee80211_sub_if_data *sdata;
if (!rx->u.rx.ra_match) if (!(rx->flags & IEEE80211_TXRXD_RXRA_MATCH))
return TXRX_DROP; return TXRX_DROP;
sdata = IEEE80211_DEV_TO_SUB_IF(rx->dev); sdata = IEEE80211_DEV_TO_SUB_IF(rx->dev);
@ -1279,30 +1282,30 @@ static int prepare_for_handlers(struct ieee80211_sub_if_data *sdata,
if (!bssid) if (!bssid)
return 0; return 0;
if (!ieee80211_bssid_match(bssid, sdata->u.sta.bssid)) { if (!ieee80211_bssid_match(bssid, sdata->u.sta.bssid)) {
if (!rx->u.rx.in_scan) if (!(rx->flags & IEEE80211_TXRXD_RXIN_SCAN))
return 0; return 0;
rx->u.rx.ra_match = 0; rx->flags &= ~IEEE80211_TXRXD_RXRA_MATCH;
} else if (!multicast && } else if (!multicast &&
compare_ether_addr(sdata->dev->dev_addr, compare_ether_addr(sdata->dev->dev_addr,
hdr->addr1) != 0) { hdr->addr1) != 0) {
if (!sdata->promisc) if (!sdata->promisc)
return 0; return 0;
rx->u.rx.ra_match = 0; rx->flags &= ~IEEE80211_TXRXD_RXRA_MATCH;
} }
break; break;
case IEEE80211_IF_TYPE_IBSS: case IEEE80211_IF_TYPE_IBSS:
if (!bssid) if (!bssid)
return 0; return 0;
if (!ieee80211_bssid_match(bssid, sdata->u.sta.bssid)) { if (!ieee80211_bssid_match(bssid, sdata->u.sta.bssid)) {
if (!rx->u.rx.in_scan) if (!(rx->flags & IEEE80211_TXRXD_RXIN_SCAN))
return 0; return 0;
rx->u.rx.ra_match = 0; rx->flags &= ~IEEE80211_TXRXD_RXRA_MATCH;
} else if (!multicast && } else if (!multicast &&
compare_ether_addr(sdata->dev->dev_addr, compare_ether_addr(sdata->dev->dev_addr,
hdr->addr1) != 0) { hdr->addr1) != 0) {
if (!sdata->promisc) if (!sdata->promisc)
return 0; return 0;
rx->u.rx.ra_match = 0; rx->flags &= ~IEEE80211_TXRXD_RXRA_MATCH;
} else if (!rx->sta) } else if (!rx->sta)
rx->sta = ieee80211_ibss_add_sta(sdata->dev, rx->skb, rx->sta = ieee80211_ibss_add_sta(sdata->dev, rx->skb,
bssid, hdr->addr2); bssid, hdr->addr2);
@ -1314,11 +1317,12 @@ static int prepare_for_handlers(struct ieee80211_sub_if_data *sdata,
return 0; return 0;
} else if (!ieee80211_bssid_match(bssid, } else if (!ieee80211_bssid_match(bssid,
sdata->dev->dev_addr)) { sdata->dev->dev_addr)) {
if (!rx->u.rx.in_scan) if (!(rx->flags & IEEE80211_TXRXD_RXIN_SCAN))
return 0; return 0;
rx->u.rx.ra_match = 0; rx->flags &= ~IEEE80211_TXRXD_RXRA_MATCH;
} }
if (sdata->dev == sdata->local->mdev && !rx->u.rx.in_scan) if (sdata->dev == sdata->local->mdev &&
!(rx->flags & IEEE80211_TXRXD_RXIN_SCAN))
/* do not receive anything via /* do not receive anything via
* master device when not scanning */ * master device when not scanning */
return 0; return 0;
@ -1384,7 +1388,7 @@ void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb,
} }
if (unlikely(local->sta_scanning)) if (unlikely(local->sta_scanning))
rx.u.rx.in_scan = 1; rx.flags |= IEEE80211_TXRXD_RXIN_SCAN;
if (__ieee80211_invoke_rx_handlers(local, local->rx_pre_handlers, &rx, if (__ieee80211_invoke_rx_handlers(local, local->rx_pre_handlers, &rx,
sta) != TXRX_CONTINUE) sta) != TXRX_CONTINUE)
@ -1394,7 +1398,7 @@ void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb,
skb_push(skb, radiotap_len); skb_push(skb, radiotap_len);
if (sta && !sta->assoc_ap && !(sta->flags & WLAN_STA_WDS) && if (sta && !sta->assoc_ap && !(sta->flags & WLAN_STA_WDS) &&
!local->iff_promiscs && !is_multicast_ether_addr(hdr->addr1)) { !local->iff_promiscs && !is_multicast_ether_addr(hdr->addr1)) {
rx.u.rx.ra_match = 1; rx.flags |= IEEE80211_TXRXD_RXRA_MATCH;
ieee80211_invoke_rx_handlers(local, local->rx_handlers, &rx, ieee80211_invoke_rx_handlers(local, local->rx_handlers, &rx,
rx.sta); rx.sta);
sta_info_put(sta); sta_info_put(sta);
@ -1405,7 +1409,7 @@ void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb,
read_lock(&local->sub_if_lock); read_lock(&local->sub_if_lock);
list_for_each_entry(sdata, &local->sub_if_list, list) { list_for_each_entry(sdata, &local->sub_if_list, list) {
rx.u.rx.ra_match = 1; rx.flags |= IEEE80211_TXRXD_RXRA_MATCH;
if (!netif_running(sdata->dev)) if (!netif_running(sdata->dev))
continue; continue;

61
net/mac80211/tx.c
View file

@ -223,12 +223,12 @@ ieee80211_tx_h_check_assoc(struct ieee80211_txrx_data *tx)
(tx->fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_PROBE_REQ)) (tx->fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_PROBE_REQ))
return TXRX_DROP; return TXRX_DROP;
if (tx->u.tx.ps_buffered) if (tx->flags & IEEE80211_TXRXD_TXPS_BUFFERED)
return TXRX_CONTINUE; return TXRX_CONTINUE;
sta_flags = tx->sta ? tx->sta->flags : 0; sta_flags = tx->sta ? tx->sta->flags : 0;
if (likely(tx->u.tx.unicast)) { if (likely(tx->flags & IEEE80211_TXRXD_TXUNICAST)) {
if (unlikely(!(sta_flags & WLAN_STA_ASSOC) && if (unlikely(!(sta_flags & WLAN_STA_ASSOC) &&
tx->sdata->type != IEEE80211_IF_TYPE_IBSS && tx->sdata->type != IEEE80211_IF_TYPE_IBSS &&
(tx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA)) { (tx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA)) {
@ -410,10 +410,10 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_txrx_data *tx)
static ieee80211_txrx_result static ieee80211_txrx_result
ieee80211_tx_h_ps_buf(struct ieee80211_txrx_data *tx) ieee80211_tx_h_ps_buf(struct ieee80211_txrx_data *tx)
{ {
if (unlikely(tx->u.tx.ps_buffered)) if (unlikely(tx->flags & IEEE80211_TXRXD_TXPS_BUFFERED))
return TXRX_CONTINUE; return TXRX_CONTINUE;
if (tx->u.tx.unicast) if (tx->flags & IEEE80211_TXRXD_TXUNICAST)
return ieee80211_tx_h_unicast_ps_buf(tx); return ieee80211_tx_h_unicast_ps_buf(tx);
else else
return ieee80211_tx_h_multicast_ps_buf(tx); return ieee80211_tx_h_multicast_ps_buf(tx);
@ -467,7 +467,7 @@ ieee80211_tx_h_fragment(struct ieee80211_txrx_data *tx)
u8 *pos; u8 *pos;
int frag_threshold = tx->local->fragmentation_threshold; int frag_threshold = tx->local->fragmentation_threshold;
if (!tx->fragmented) if (!(tx->flags & IEEE80211_TXRXD_FRAGMENTED))
return TXRX_CONTINUE; return TXRX_CONTINUE;
first = tx->skb; first = tx->skb;
@ -604,7 +604,7 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_txrx_data *tx)
&extra); &extra);
if (unlikely(extra.probe != NULL)) { if (unlikely(extra.probe != NULL)) {
tx->u.tx.control->flags |= IEEE80211_TXCTL_RATE_CTRL_PROBE; tx->u.tx.control->flags |= IEEE80211_TXCTL_RATE_CTRL_PROBE;
tx->u.tx.probe_last_frag = 1; tx->flags |= IEEE80211_TXRXD_TXPROBE_LAST_FRAG;
tx->u.tx.control->alt_retry_rate = tx->u.tx.rate->val; tx->u.tx.control->alt_retry_rate = tx->u.tx.rate->val;
tx->u.tx.rate = extra.probe; tx->u.tx.rate = extra.probe;
} else { } else {
@ -613,11 +613,13 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_txrx_data *tx)
if (!tx->u.tx.rate) if (!tx->u.tx.rate)
return TXRX_DROP; return TXRX_DROP;
if (tx->u.tx.mode->mode == MODE_IEEE80211G && if (tx->u.tx.mode->mode == MODE_IEEE80211G &&
tx->sdata->use_protection && tx->fragmented && tx->sdata->use_protection &&
extra.nonerp) { (tx->flags & IEEE80211_TXRXD_FRAGMENTED) && extra.nonerp) {
tx->u.tx.last_frag_rate = tx->u.tx.rate; tx->u.tx.last_frag_rate = tx->u.tx.rate;
tx->u.tx.probe_last_frag = extra.probe ? 1 : 0; if (extra.probe)
tx->flags &= ~IEEE80211_TXRXD_TXPROBE_LAST_FRAG;
else
tx->flags |= IEEE80211_TXRXD_TXPROBE_LAST_FRAG;
tx->u.tx.rate = extra.nonerp; tx->u.tx.rate = extra.nonerp;
tx->u.tx.control->rate = extra.nonerp; tx->u.tx.control->rate = extra.nonerp;
tx->u.tx.control->flags &= ~IEEE80211_TXCTL_RATE_CTRL_PROBE; tx->u.tx.control->flags &= ~IEEE80211_TXCTL_RATE_CTRL_PROBE;
@ -654,7 +656,7 @@ ieee80211_tx_h_misc(struct ieee80211_txrx_data *tx)
control->retry_limit = 1; control->retry_limit = 1;
} }
if (tx->fragmented) { if (tx->flags & IEEE80211_TXRXD_FRAGMENTED) {
/* Do not use multiple retry rates when sending fragmented /* Do not use multiple retry rates when sending fragmented
* frames. * frames.
* TODO: The last fragment could still use multiple retry * TODO: The last fragment could still use multiple retry
@ -667,7 +669,8 @@ ieee80211_tx_h_misc(struct ieee80211_txrx_data *tx)
* for the frame. */ * for the frame. */
if (mode->mode == MODE_IEEE80211G && if (mode->mode == MODE_IEEE80211G &&
(tx->u.tx.rate->flags & IEEE80211_RATE_ERP) && (tx->u.tx.rate->flags & IEEE80211_RATE_ERP) &&
tx->u.tx.unicast && tx->sdata->use_protection && (tx->flags & IEEE80211_TXRXD_TXUNICAST) &&
tx->sdata->use_protection &&
!(control->flags & IEEE80211_TXCTL_USE_RTS_CTS)) !(control->flags & IEEE80211_TXCTL_USE_RTS_CTS))
control->flags |= IEEE80211_TXCTL_USE_CTS_PROTECT; control->flags |= IEEE80211_TXCTL_USE_CTS_PROTECT;
@ -685,8 +688,8 @@ ieee80211_tx_h_misc(struct ieee80211_txrx_data *tx)
* for remaining fragments will be updated when they are being sent * for remaining fragments will be updated when they are being sent
* to low-level driver in ieee80211_tx(). */ * to low-level driver in ieee80211_tx(). */
dur = ieee80211_duration(tx, is_multicast_ether_addr(hdr->addr1), dur = ieee80211_duration(tx, is_multicast_ether_addr(hdr->addr1),
tx->fragmented ? tx->u.tx.extra_frag[0]->len : (tx->flags & IEEE80211_TXRXD_FRAGMENTED) ?
0); tx->u.tx.extra_frag[0]->len : 0);
hdr->duration_id = cpu_to_le16(dur); hdr->duration_id = cpu_to_le16(dur);
if ((control->flags & IEEE80211_TXCTL_USE_RTS_CTS) || if ((control->flags & IEEE80211_TXCTL_USE_RTS_CTS) ||
@ -976,15 +979,20 @@ __ieee80211_tx_prepare(struct ieee80211_txrx_data *tx,
} }
tx->u.tx.control = control; tx->u.tx.control = control;
tx->u.tx.unicast = !is_multicast_ether_addr(hdr->addr1); if (is_multicast_ether_addr(hdr->addr1)) {
if (is_multicast_ether_addr(hdr->addr1)) tx->flags &= ~IEEE80211_TXRXD_TXUNICAST;
control->flags |= IEEE80211_TXCTL_NO_ACK; control->flags |= IEEE80211_TXCTL_NO_ACK;
else } else {
tx->flags |= IEEE80211_TXRXD_TXUNICAST;
control->flags &= ~IEEE80211_TXCTL_NO_ACK; control->flags &= ~IEEE80211_TXCTL_NO_ACK;
tx->fragmented = local->fragmentation_threshold < }
IEEE80211_MAX_FRAG_THRESHOLD && tx->u.tx.unicast && if (local->fragmentation_threshold < IEEE80211_MAX_FRAG_THRESHOLD &&
skb->len + FCS_LEN > local->fragmentation_threshold && (tx->flags & IEEE80211_TXRXD_TXUNICAST) &&
(!local->ops->set_frag_threshold); skb->len + FCS_LEN > local->fragmentation_threshold &&
!local->ops->set_frag_threshold)
tx->flags |= IEEE80211_TXRXD_FRAGMENTED;
else
tx->flags &= ~IEEE80211_TXRXD_FRAGMENTED;
if (!tx->sta) if (!tx->sta)
control->flags |= IEEE80211_TXCTL_CLEAR_DST_MASK; control->flags |= IEEE80211_TXCTL_CLEAR_DST_MASK;
else if (tx->sta->clear_dst_mask) { else if (tx->sta->clear_dst_mask) {
@ -1055,7 +1063,7 @@ static int __ieee80211_tx(struct ieee80211_local *local, struct sk_buff *skb,
if (i == tx->u.tx.num_extra_frag) { if (i == tx->u.tx.num_extra_frag) {
control->tx_rate = tx->u.tx.last_frag_hwrate; control->tx_rate = tx->u.tx.last_frag_hwrate;
control->rate = tx->u.tx.last_frag_rate; control->rate = tx->u.tx.last_frag_rate;
if (tx->u.tx.probe_last_frag) if (tx->flags & IEEE80211_TXRXD_TXPROBE_LAST_FRAG)
control->flags |= control->flags |=
IEEE80211_TXCTL_RATE_CTRL_PROBE; IEEE80211_TXCTL_RATE_CTRL_PROBE;
else else
@ -1186,7 +1194,8 @@ retry:
store->num_extra_frag = tx.u.tx.num_extra_frag; store->num_extra_frag = tx.u.tx.num_extra_frag;
store->last_frag_hwrate = tx.u.tx.last_frag_hwrate; store->last_frag_hwrate = tx.u.tx.last_frag_hwrate;
store->last_frag_rate = tx.u.tx.last_frag_rate; store->last_frag_rate = tx.u.tx.last_frag_rate;
store->last_frag_rate_ctrl_probe = tx.u.tx.probe_last_frag; store->last_frag_rate_ctrl_probe =
!!(tx.flags & IEEE80211_TXRXD_TXPROBE_LAST_FRAG);
} }
return 0; return 0;
@ -1613,7 +1622,9 @@ void ieee80211_tx_pending(unsigned long data)
tx.u.tx.num_extra_frag = store->num_extra_frag; tx.u.tx.num_extra_frag = store->num_extra_frag;
tx.u.tx.last_frag_hwrate = store->last_frag_hwrate; tx.u.tx.last_frag_hwrate = store->last_frag_hwrate;
tx.u.tx.last_frag_rate = store->last_frag_rate; tx.u.tx.last_frag_rate = store->last_frag_rate;
tx.u.tx.probe_last_frag = store->last_frag_rate_ctrl_probe; tx.flags = 0;
if (store->last_frag_rate_ctrl_probe)
tx.flags |= IEEE80211_TXRXD_TXPROBE_LAST_FRAG;
ret = __ieee80211_tx(local, store->skb, &tx); ret = __ieee80211_tx(local, store->skb, &tx);
if (ret) { if (ret) {
if (ret == IEEE80211_TX_FRAG_AGAIN) if (ret == IEEE80211_TX_FRAG_AGAIN)
@ -1859,7 +1870,7 @@ ieee80211_get_buffered_bc(struct ieee80211_hw *hw, int if_id,
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
} }
sta = tx.sta; sta = tx.sta;
tx.u.tx.ps_buffered = 1; tx.flags |= IEEE80211_TXRXD_TXPS_BUFFERED;
for (handler = local->tx_handlers; *handler != NULL; handler++) { for (handler = local->tx_handlers; *handler != NULL; handler++) {
res = (*handler)(&tx); res = (*handler)(&tx);

6
net/mac80211/wpa.c
View file

@ -90,7 +90,7 @@ ieee80211_tx_h_michael_mic_add(struct ieee80211_txrx_data *tx)
return TXRX_DROP; return TXRX_DROP;
if (!tx->key->force_sw_encrypt && if (!tx->key->force_sw_encrypt &&
!tx->fragmented && !(tx->flags & IEEE80211_TXRXD_FRAGMENTED) &&
!(tx->local->hw.flags & IEEE80211_HW_TKIP_INCLUDE_MMIC) && !(tx->local->hw.flags & IEEE80211_HW_TKIP_INCLUDE_MMIC) &&
!wpa_test) { !wpa_test) {
/* hwaccel - with no need for preallocated room for Michael MIC /* hwaccel - with no need for preallocated room for Michael MIC
@ -154,7 +154,7 @@ ieee80211_rx_h_michael_mic_verify(struct ieee80211_txrx_data *rx)
/* Need to verify Michael MIC sometimes in software even when /* Need to verify Michael MIC sometimes in software even when
* hwaccel is used. Atheros ar5212: fragmented frames and QoS * hwaccel is used. Atheros ar5212: fragmented frames and QoS
* frames. */ * frames. */
if (!rx->fragmented && !wpa_test) if (!(rx->flags & IEEE80211_TXRXD_FRAGMENTED) && !wpa_test)
goto remove_mic; goto remove_mic;
} }
@ -173,7 +173,7 @@ ieee80211_rx_h_michael_mic_verify(struct ieee80211_txrx_data *rx)
ALG_TKIP_TEMP_AUTH_TX_MIC_KEY]; ALG_TKIP_TEMP_AUTH_TX_MIC_KEY];
michael_mic(key, da, sa, qos_tid & 0x0f, data, data_len, mic); michael_mic(key, da, sa, qos_tid & 0x0f, data, data_len, mic);
if (memcmp(mic, data + data_len, MICHAEL_MIC_LEN) != 0 || wpa_test) { if (memcmp(mic, data + data_len, MICHAEL_MIC_LEN) != 0 || wpa_test) {
if (!rx->u.rx.ra_match) if (!(rx->flags & IEEE80211_TXRXD_RXRA_MATCH))
return TXRX_DROP; return TXRX_DROP;
printk(KERN_DEBUG "%s: invalid Michael MIC in data frame from " printk(KERN_DEBUG "%s: invalid Michael MIC in data frame from "