Skip to content

L
linux
Commit 5cf121c3 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files
Options

mac80211: split ieee80211_txrx_data 

Split it into ieee80211_tx_data and ieee80211_rx_data to clarify
usage/flag usage and remove the stupid union thing.
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7495883b
Show whitespace changes
Inline Side-by-side
Showing with 315 additions and 306 deletions
net/mac80211/ieee80211_i.h
View file @ 5cf121c3
...@@ -142,26 +142,13 @@ typedef unsigned __bitwise__ ieee80211_tx_result; ...@@ -142,26 +142,13 @@ typedef unsigned __bitwise__ ieee80211_tx_result;
#define TX_DROP ((__force ieee80211_tx_result) 1u) #define TX_DROP ((__force ieee80211_tx_result) 1u)
#define TX_QUEUED ((__force ieee80211_tx_result) 2u) #define TX_QUEUED ((__force ieee80211_tx_result) 2u)
typedef unsigned __bitwise__ ieee80211_rx_result; #define IEEE80211_TX_FRAGMENTED BIT(0)
#define RX_CONTINUE ((__force ieee80211_rx_result) 0u) #define IEEE80211_TX_UNICAST BIT(1)
#define RX_DROP_UNUSABLE ((__force ieee80211_rx_result) 1u) #define IEEE80211_TX_PS_BUFFERED BIT(2)
#define RX_DROP_MONITOR ((__force ieee80211_rx_result) 2u) #define IEEE80211_TX_PROBE_LAST_FRAG BIT(3)
#define RX_QUEUED ((__force ieee80211_rx_result) 3u) #define IEEE80211_TX_INJECTED BIT(4)
/* flags used in struct ieee80211_txrx_data.flags */ struct ieee80211_tx_data {
/* 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)
#define IEEE80211_TXRXD_TX_INJECTED BIT(6)
#define IEEE80211_TXRXD_RX_AMSDU BIT(7)
#define IEEE80211_TXRXD_RX_CMNTR_REPORTED BIT(8)
struct ieee80211_txrx_data {
struct sk_buff *skb; struct sk_buff *skb;
struct net_device *dev; struct net_device *dev;
struct ieee80211_local *local; struct ieee80211_local *local;
...@@ -170,8 +157,7 @@ struct ieee80211_txrx_data { ...@@ -170,8 +157,7 @@ struct ieee80211_txrx_data {
u16 fc, ethertype; u16 fc, ethertype;
struct ieee80211_key *key; struct ieee80211_key *key;
unsigned int flags; unsigned int flags;
union {
struct {
struct ieee80211_tx_control *control; struct ieee80211_tx_control *control;
struct ieee80211_channel *channel; struct ieee80211_channel *channel;
struct ieee80211_rate *rate; struct ieee80211_rate *rate;
...@@ -184,8 +170,32 @@ struct ieee80211_txrx_data { ...@@ -184,8 +170,32 @@ struct ieee80211_txrx_data {
* in skb) */ * in skb) */
int num_extra_frag; int num_extra_frag;
struct sk_buff **extra_frag; struct sk_buff **extra_frag;
} tx; };
struct {
typedef unsigned __bitwise__ ieee80211_rx_result;
#define RX_CONTINUE ((__force ieee80211_rx_result) 0u)
#define RX_DROP_UNUSABLE ((__force ieee80211_rx_result) 1u)
#define RX_DROP_MONITOR ((__force ieee80211_rx_result) 2u)
#define RX_QUEUED ((__force ieee80211_rx_result) 3u)
#define IEEE80211_RX_IN_SCAN BIT(0)
/* frame is destined to interface currently processed (incl. multicast frames) */
#define IEEE80211_RX_RA_MATCH BIT(1)
#define IEEE80211_RX_AMSDU BIT(2)
#define IEEE80211_RX_CMNTR_REPORTED BIT(3)
#define IEEE80211_RX_FRAGMENTED BIT(4)
struct ieee80211_rx_data {
struct sk_buff *skb;
struct net_device *dev;
struct ieee80211_local *local;
struct ieee80211_sub_if_data *sdata;
struct sta_info *sta;
u16 fc, ethertype;
struct ieee80211_key *key;
unsigned int flags;
struct ieee80211_rx_status *status; struct ieee80211_rx_status *status;
struct ieee80211_rate *rate; struct ieee80211_rate *rate;
int sent_ps_buffered; int sent_ps_buffered;
...@@ -193,8 +203,6 @@ struct ieee80211_txrx_data { ...@@ -193,8 +203,6 @@ struct ieee80211_txrx_data {
int load; int load;
u32 tkip_iv32; u32 tkip_iv32;
u16 tkip_iv16; u16 tkip_iv16;
} rx;
} u;
}; };
/* flags used in struct ieee80211_tx_packet_data.flags */ /* flags used in struct ieee80211_tx_packet_data.flags */
...@@ -842,7 +850,7 @@ static inline int ieee80211_bssid_match(const u8 *raddr, const u8 *addr) ...@@ -842,7 +850,7 @@ static inline int ieee80211_bssid_match(const u8 *raddr, const u8 *addr)
int ieee80211_hw_config(struct ieee80211_local *local); int ieee80211_hw_config(struct ieee80211_local *local);
int ieee80211_if_config(struct net_device *dev); int ieee80211_if_config(struct net_device *dev);
int ieee80211_if_config_beacon(struct net_device *dev); int ieee80211_if_config_beacon(struct net_device *dev);
void ieee80211_tx_set_iswep(struct ieee80211_txrx_data *tx); void ieee80211_tx_set_protected(struct ieee80211_tx_data *tx);
int ieee80211_if_update_wds(struct net_device *dev, u8 *remote_addr); int ieee80211_if_update_wds(struct net_device *dev, u8 *remote_addr);
void ieee80211_if_setup(struct net_device *dev); void ieee80211_if_setup(struct net_device *dev);
int ieee80211_hw_config_ht(struct ieee80211_local *local, int enable_ht, int ieee80211_hw_config_ht(struct ieee80211_local *local, int enable_ht,
......
net/mac80211/rx.c
View file @ 5cf121c3
...@@ -251,7 +251,7 @@ ieee80211_rx_monitor(struct ieee80211_local *local, struct sk_buff *origskb, ...@@ -251,7 +251,7 @@ ieee80211_rx_monitor(struct ieee80211_local *local, struct sk_buff *origskb,
} }
static void ieee80211_parse_qos(struct ieee80211_txrx_data *rx) static void ieee80211_parse_qos(struct ieee80211_rx_data *rx)
{ {
u8 *data = rx->skb->data; u8 *data = rx->skb->data;
int tid; int tid;
...@@ -262,9 +262,9 @@ static void ieee80211_parse_qos(struct ieee80211_txrx_data *rx) ...@@ -262,9 +262,9 @@ static void ieee80211_parse_qos(struct ieee80211_txrx_data *rx)
/* frame has qos control */ /* frame has qos control */
tid = qc[0] & QOS_CONTROL_TID_MASK; tid = qc[0] & QOS_CONTROL_TID_MASK;
if (qc[0] & IEEE80211_QOS_CONTROL_A_MSDU_PRESENT) if (qc[0] & IEEE80211_QOS_CONTROL_A_MSDU_PRESENT)
rx->flags |= IEEE80211_TXRXD_RX_AMSDU; rx->flags |= IEEE80211_RX_AMSDU;
else else
rx->flags &= ~IEEE80211_TXRXD_RX_AMSDU; rx->flags &= ~IEEE80211_RX_AMSDU;
} else { } else {
if (unlikely((rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT)) { if (unlikely((rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT)) {
/* Separate TID for management frames */ /* Separate TID for management frames */
...@@ -280,13 +280,13 @@ static void ieee80211_parse_qos(struct ieee80211_txrx_data *rx) ...@@ -280,13 +280,13 @@ static void ieee80211_parse_qos(struct ieee80211_txrx_data *rx)
if (rx->sta) if (rx->sta)
I802_DEBUG_INC(rx->sta->wme_rx_queue[tid]); I802_DEBUG_INC(rx->sta->wme_rx_queue[tid]);
rx->u.rx.queue = tid; rx->queue = tid;
/* Set skb->priority to 1d tag if highest order bit of TID is not set. /* Set skb->priority to 1d tag if highest order bit of TID is not set.
* For now, set skb->priority to 0 for other cases. */ * For now, set skb->priority to 0 for other cases. */
rx->skb->priority = (tid > 7) ? 0 : tid; rx->skb->priority = (tid > 7) ? 0 : tid;
} }
static void ieee80211_verify_ip_alignment(struct ieee80211_txrx_data *rx) static void ieee80211_verify_ip_alignment(struct ieee80211_rx_data *rx)
{ {
#ifdef CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT #ifdef CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT
int hdrlen; int hdrlen;
...@@ -314,7 +314,7 @@ static void ieee80211_verify_ip_alignment(struct ieee80211_txrx_data *rx) ...@@ -314,7 +314,7 @@ static void ieee80211_verify_ip_alignment(struct ieee80211_txrx_data *rx)
* to move the 802.11 header further back in that case. * to move the 802.11 header further back in that case.
*/ */
hdrlen = ieee80211_get_hdrlen(rx->fc); hdrlen = ieee80211_get_hdrlen(rx->fc);
if (rx->flags & IEEE80211_TXRXD_RX_AMSDU) if (rx->flags & IEEE80211_RX_AMSDU)
hdrlen += ETH_HLEN; hdrlen += ETH_HLEN;
WARN_ON_ONCE(((unsigned long)(rx->skb->data + hdrlen)) & 3); WARN_ON_ONCE(((unsigned long)(rx->skb->data + hdrlen)) & 3);
#endif #endif
...@@ -357,32 +357,32 @@ static u32 ieee80211_rx_load_stats(struct ieee80211_local *local, ...@@ -357,32 +357,32 @@ static u32 ieee80211_rx_load_stats(struct ieee80211_local *local,
/* rx handlers */ /* rx handlers */
static ieee80211_rx_result static ieee80211_rx_result
ieee80211_rx_h_if_stats(struct ieee80211_txrx_data *rx) ieee80211_rx_h_if_stats(struct ieee80211_rx_data *rx)
{ {
if (rx->sta) if (rx->sta)
rx->sta->channel_use_raw += rx->u.rx.load; rx->sta->channel_use_raw += rx->load;
rx->sdata->channel_use_raw += rx->u.rx.load; rx->sdata->channel_use_raw += rx->load;
return RX_CONTINUE; return RX_CONTINUE;
} }
static ieee80211_rx_result static ieee80211_rx_result
ieee80211_rx_h_passive_scan(struct ieee80211_txrx_data *rx) ieee80211_rx_h_passive_scan(struct ieee80211_rx_data *rx)
{ {
struct ieee80211_local *local = rx->local; struct ieee80211_local *local = rx->local;
struct sk_buff *skb = rx->skb; struct sk_buff *skb = rx->skb;
if (unlikely(local->sta_hw_scanning)) if (unlikely(local->sta_hw_scanning))
return ieee80211_sta_rx_scan(rx->dev, skb, rx->u.rx.status); return ieee80211_sta_rx_scan(rx->dev, skb, rx->status);
if (unlikely(local->sta_sw_scanning)) { if (unlikely(local->sta_sw_scanning)) {
/* drop all the other packets during a software scan anyway */ /* drop all the other packets during a software scan anyway */
if (ieee80211_sta_rx_scan(rx->dev, skb, rx->u.rx.status) if (ieee80211_sta_rx_scan(rx->dev, skb, rx->status)
!= RX_QUEUED) != RX_QUEUED)
dev_kfree_skb(skb); dev_kfree_skb(skb);
return RX_QUEUED; return RX_QUEUED;
} }
if (unlikely(rx->flags & IEEE80211_TXRXD_RXIN_SCAN)) { if (unlikely(rx->flags & IEEE80211_RX_IN_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 RX_DROP_UNUSABLE; return RX_DROP_UNUSABLE;
...@@ -392,7 +392,7 @@ ieee80211_rx_h_passive_scan(struct ieee80211_txrx_data *rx) ...@@ -392,7 +392,7 @@ ieee80211_rx_h_passive_scan(struct ieee80211_txrx_data *rx)
} }
static ieee80211_rx_result static ieee80211_rx_result
ieee80211_rx_mesh_check(struct ieee80211_txrx_data *rx) ieee80211_rx_mesh_check(struct ieee80211_rx_data *rx)
{ {
int hdrlen = ieee80211_get_hdrlen(rx->fc); int hdrlen = ieee80211_get_hdrlen(rx->fc);
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) rx->skb->data; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) rx->skb->data;
...@@ -443,7 +443,7 @@ ieee80211_rx_mesh_check(struct ieee80211_txrx_data *rx) ...@@ -443,7 +443,7 @@ ieee80211_rx_mesh_check(struct ieee80211_txrx_data *rx)
static ieee80211_rx_result static ieee80211_rx_result
ieee80211_rx_h_check(struct ieee80211_txrx_data *rx) ieee80211_rx_h_check(struct ieee80211_rx_data *rx)
{ {
struct ieee80211_hdr *hdr; struct ieee80211_hdr *hdr;
...@@ -452,15 +452,15 @@ ieee80211_rx_h_check(struct ieee80211_txrx_data *rx) ...@@ -452,15 +452,15 @@ ieee80211_rx_h_check(struct ieee80211_txrx_data *rx)
/* Drop duplicate 802.11 retransmissions (IEEE 802.11 Chap. 9.2.9) */ /* Drop duplicate 802.11 retransmissions (IEEE 802.11 Chap. 9.2.9) */
if (rx->sta && !is_multicast_ether_addr(hdr->addr1)) { if (rx->sta && !is_multicast_ether_addr(hdr->addr1)) {
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->queue] ==
hdr->seq_ctrl)) { hdr->seq_ctrl)) {
if (rx->flags & IEEE80211_TXRXD_RXRA_MATCH) { if (rx->flags & IEEE80211_RX_RA_MATCH) {
rx->local->dot11FrameDuplicateCount++; rx->local->dot11FrameDuplicateCount++;
rx->sta->num_duplicates++; rx->sta->num_duplicates++;
} }
return RX_DROP_MONITOR; return RX_DROP_MONITOR;
} else } else
rx->sta->last_seq_ctrl[rx->u.rx.queue] = hdr->seq_ctrl; rx->sta->last_seq_ctrl[rx->queue] = hdr->seq_ctrl;
} }
if (unlikely(rx->skb->len < 16)) { if (unlikely(rx->skb->len < 16)) {
...@@ -488,7 +488,7 @@ ieee80211_rx_h_check(struct ieee80211_txrx_data *rx) ...@@ -488,7 +488,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->flags & IEEE80211_TXRXD_RXRA_MATCH)) { || !(rx->flags & IEEE80211_RX_RA_MATCH)) {
/* Drop IBSS frames and frames for other hosts /* Drop IBSS frames and frames for other hosts
* silently. */ * silently. */
return RX_DROP_MONITOR; return RX_DROP_MONITOR;
...@@ -502,7 +502,7 @@ ieee80211_rx_h_check(struct ieee80211_txrx_data *rx) ...@@ -502,7 +502,7 @@ ieee80211_rx_h_check(struct ieee80211_txrx_data *rx)
static ieee80211_rx_result static ieee80211_rx_result
ieee80211_rx_h_decrypt(struct ieee80211_txrx_data *rx) ieee80211_rx_h_decrypt(struct ieee80211_rx_data *rx)
{ {
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) rx->skb->data; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) rx->skb->data;
int keyidx; int keyidx;
...@@ -543,7 +543,7 @@ ieee80211_rx_h_decrypt(struct ieee80211_txrx_data *rx) ...@@ -543,7 +543,7 @@ ieee80211_rx_h_decrypt(struct ieee80211_txrx_data *rx)
* No point in finding a key and decrypting if the frame is neither * No point in finding a key and decrypting if the frame is neither
* addressed to us nor a multicast frame. * addressed to us nor a multicast frame.
*/ */
if (!(rx->flags & IEEE80211_TXRXD_RXRA_MATCH)) if (!(rx->flags & IEEE80211_RX_RA_MATCH))
return RX_CONTINUE; return RX_CONTINUE;
if (rx->sta) if (rx->sta)
...@@ -561,8 +561,8 @@ ieee80211_rx_h_decrypt(struct ieee80211_txrx_data *rx) ...@@ -561,8 +561,8 @@ ieee80211_rx_h_decrypt(struct ieee80211_txrx_data *rx)
* we somehow allow the driver to tell us which key * we somehow allow the driver to tell us which key
* the hardware used if this flag is set? * the hardware used if this flag is set?
*/ */
if ((rx->u.rx.status->flag & RX_FLAG_DECRYPTED) && if ((rx->status->flag & RX_FLAG_DECRYPTED) &&
(rx->u.rx.status->flag & RX_FLAG_IV_STRIPPED)) (rx->status->flag & RX_FLAG_IV_STRIPPED))
return RX_CONTINUE; return RX_CONTINUE;
hdrlen = ieee80211_get_hdrlen(rx->fc); hdrlen = ieee80211_get_hdrlen(rx->fc);
...@@ -603,8 +603,8 @@ ieee80211_rx_h_decrypt(struct ieee80211_txrx_data *rx) ...@@ -603,8 +603,8 @@ ieee80211_rx_h_decrypt(struct ieee80211_txrx_data *rx)
/* Check for weak IVs if possible */ /* Check for weak IVs if possible */
if (rx->sta && rx->key->conf.alg == ALG_WEP && if (rx->sta && rx->key->conf.alg == ALG_WEP &&
((rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA) && ((rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA) &&
(!(rx->u.rx.status->flag & RX_FLAG_IV_STRIPPED) || (!(rx->status->flag & RX_FLAG_IV_STRIPPED) ||
!(rx->u.rx.status->flag & RX_FLAG_DECRYPTED)) && !(rx->status->flag & RX_FLAG_DECRYPTED)) &&
ieee80211_wep_is_weak_iv(rx->skb, rx->key)) ieee80211_wep_is_weak_iv(rx->skb, rx->key))
rx->sta->wep_weak_iv_count++; rx->sta->wep_weak_iv_count++;
...@@ -621,7 +621,7 @@ ieee80211_rx_h_decrypt(struct ieee80211_txrx_data *rx) ...@@ -621,7 +621,7 @@ ieee80211_rx_h_decrypt(struct ieee80211_txrx_data *rx)
} }
/* either the frame has been decrypted or will be dropped */ /* either the frame has been decrypted or will be dropped */
rx->u.rx.status->flag |= RX_FLAG_DECRYPTED; rx->status->flag |= RX_FLAG_DECRYPTED;
return result; return result;
} }
...@@ -691,7 +691,7 @@ static int ap_sta_ps_end(struct net_device *dev, struct sta_info *sta) ...@@ -691,7 +691,7 @@ static int ap_sta_ps_end(struct net_device *dev, struct sta_info *sta)
} }
static ieee80211_rx_result static ieee80211_rx_result
ieee80211_rx_h_sta_process(struct ieee80211_txrx_data *rx) ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx)
{ {
struct sta_info *sta = rx->sta; struct sta_info *sta = rx->sta;
struct net_device *dev = rx->dev; struct net_device *dev = rx->dev;
...@@ -720,20 +720,20 @@ ieee80211_rx_h_sta_process(struct ieee80211_txrx_data *rx) ...@@ -720,20 +720,20 @@ ieee80211_rx_h_sta_process(struct ieee80211_txrx_data *rx)
sta->last_rx = jiffies; sta->last_rx = jiffies;
} }
if (!(rx->flags & IEEE80211_TXRXD_RXRA_MATCH)) if (!(rx->flags & IEEE80211_RX_RA_MATCH))
return RX_CONTINUE; return RX_CONTINUE;
sta->rx_fragments++; sta->rx_fragments++;
sta->rx_bytes += rx->skb->len; sta->rx_bytes += rx->skb->len;
sta->last_rssi = rx->u.rx.status->ssi; sta->last_rssi = rx->status->ssi;
sta->last_signal = rx->u.rx.status->signal; sta->last_signal = rx->status->signal;
sta->last_noise = rx->u.rx.status->noise; sta->last_noise = rx->status->noise;
if (!(rx->fc & IEEE80211_FCTL_MOREFRAGS)) { if (!(rx->fc & IEEE80211_FCTL_MOREFRAGS)) {
/* Change STA power saving mode only in the end of a frame /* Change STA power saving mode only in the end of a frame
* exchange sequence */ * exchange sequence */
if ((sta->flags & WLAN_STA_PS) && !(rx->fc & IEEE80211_FCTL_PM)) if ((sta->flags & WLAN_STA_PS) && !(rx->fc & IEEE80211_FCTL_PM))
rx->u.rx.sent_ps_buffered += ap_sta_ps_end(dev, sta); rx->sent_ps_buffered += ap_sta_ps_end(dev, sta);
else if (!(sta->flags & WLAN_STA_PS) && else if (!(sta->flags & WLAN_STA_PS) &&
(rx->fc & IEEE80211_FCTL_PM)) (rx->fc & IEEE80211_FCTL_PM))
ap_sta_ps_start(dev, sta); ap_sta_ps_start(dev, sta);
...@@ -838,7 +838,7 @@ ieee80211_reassemble_find(struct ieee80211_sub_if_data *sdata, ...@@ -838,7 +838,7 @@ ieee80211_reassemble_find(struct ieee80211_sub_if_data *sdata,
} }
static ieee80211_rx_result static ieee80211_rx_result
ieee80211_rx_h_defragment(struct ieee80211_txrx_data *rx) ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx)
{ {
struct ieee80211_hdr *hdr; struct ieee80211_hdr *hdr;
u16 sc; u16 sc;
...@@ -864,14 +864,14 @@ ieee80211_rx_h_defragment(struct ieee80211_txrx_data *rx) ...@@ -864,14 +864,14 @@ ieee80211_rx_h_defragment(struct ieee80211_txrx_data *rx)
if (frag == 0) { if (frag == 0) {
/* This is the first fragment of a new frame. */ /* This is the first fragment of a new frame. */
entry = ieee80211_reassemble_add(rx->sdata, frag, seq, entry = ieee80211_reassemble_add(rx->sdata, frag, seq,
rx->u.rx.queue, &(rx->skb)); rx->queue, &(rx->skb));
if (rx->key && rx->key->conf.alg == ALG_CCMP && if (rx->key && rx->key->conf.alg == ALG_CCMP &&
(rx->fc & IEEE80211_FCTL_PROTECTED)) { (rx->fc & IEEE80211_FCTL_PROTECTED)) {
/* Store CCMP PN so that we can verify that the next /* Store CCMP PN so that we can verify that the next
* fragment has a sequential PN value. */ * fragment has a sequential PN value. */
entry->ccmp = 1; entry->ccmp = 1;
memcpy(entry->last_pn, memcpy(entry->last_pn,
rx->key->u.ccmp.rx_pn[rx->u.rx.queue], rx->key->u.ccmp.rx_pn[rx->queue],
CCMP_PN_LEN); CCMP_PN_LEN);
} }
return RX_QUEUED; return RX_QUEUED;
...@@ -881,7 +881,7 @@ ieee80211_rx_h_defragment(struct ieee80211_txrx_data *rx) ...@@ -881,7 +881,7 @@ ieee80211_rx_h_defragment(struct ieee80211_txrx_data *rx)
* fragment cache. Add this fragment to the end of the pending entry. * fragment cache. Add this fragment to the end of the pending entry.
*/ */
entry = ieee80211_reassemble_find(rx->sdata, rx->fc, frag, seq, entry = ieee80211_reassemble_find(rx->sdata, rx->fc, frag, seq,
rx->u.rx.queue, hdr); rx->queue, hdr);
if (!entry) { if (!entry) {
I802_DEBUG_INC(rx->local->rx_handlers_drop_defrag); I802_DEBUG_INC(rx->local->rx_handlers_drop_defrag);
return RX_DROP_MONITOR; return RX_DROP_MONITOR;
...@@ -900,7 +900,7 @@ ieee80211_rx_h_defragment(struct ieee80211_txrx_data *rx) ...@@ -900,7 +900,7 @@ ieee80211_rx_h_defragment(struct ieee80211_txrx_data *rx)
if (pn[i]) if (pn[i])
break; break;
} }
rpn = rx->key->u.ccmp.rx_pn[rx->u.rx.queue]; rpn = rx->key->u.ccmp.rx_pn[rx->queue];
if (memcmp(pn, rpn, CCMP_PN_LEN) != 0) { if (memcmp(pn, rpn, CCMP_PN_LEN) != 0) {
if (net_ratelimit()) if (net_ratelimit())
printk(KERN_DEBUG "%s: defrag: CCMP PN not " printk(KERN_DEBUG "%s: defrag: CCMP PN not "
...@@ -941,7 +941,7 @@ ieee80211_rx_h_defragment(struct ieee80211_txrx_data *rx) ...@@ -941,7 +941,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->flags |= IEEE80211_TXRXD_FRAGMENTED; rx->flags |= IEEE80211_RX_FRAGMENTED;
out: out:
if (rx->sta) if (rx->sta)
...@@ -954,7 +954,7 @@ ieee80211_rx_h_defragment(struct ieee80211_txrx_data *rx) ...@@ -954,7 +954,7 @@ ieee80211_rx_h_defragment(struct ieee80211_txrx_data *rx)
} }
static ieee80211_rx_result static ieee80211_rx_result
ieee80211_rx_h_ps_poll(struct ieee80211_txrx_data *rx) ieee80211_rx_h_ps_poll(struct ieee80211_rx_data *rx)
{ {
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(rx->dev); struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(rx->dev);
struct sk_buff *skb; struct sk_buff *skb;
...@@ -964,7 +964,7 @@ ieee80211_rx_h_ps_poll(struct ieee80211_txrx_data *rx) ...@@ -964,7 +964,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->flags & IEEE80211_TXRXD_RXRA_MATCH))) !(rx->flags & IEEE80211_RX_RA_MATCH)))
return RX_CONTINUE; return RX_CONTINUE;
if ((sdata->vif.type != IEEE80211_IF_TYPE_AP) && if ((sdata->vif.type != IEEE80211_IF_TYPE_AP) &&
...@@ -1008,7 +1008,7 @@ ieee80211_rx_h_ps_poll(struct ieee80211_txrx_data *rx) ...@@ -1008,7 +1008,7 @@ ieee80211_rx_h_ps_poll(struct ieee80211_txrx_data *rx)
if (no_pending_pkts) if (no_pending_pkts)
sta_info_clear_tim_bit(rx->sta); sta_info_clear_tim_bit(rx->sta);
#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
} else if (!rx->u.rx.sent_ps_buffered) { } else if (!rx->sent_ps_buffered) {
/* /*
* FIXME: This can be the result of a race condition between * FIXME: This can be the result of a race condition between
* us expiring a frame and the station polling for it. * us expiring a frame and the station polling for it.
...@@ -1029,7 +1029,7 @@ ieee80211_rx_h_ps_poll(struct ieee80211_txrx_data *rx) ...@@ -1029,7 +1029,7 @@ ieee80211_rx_h_ps_poll(struct ieee80211_txrx_data *rx)
} }
static ieee80211_rx_result static ieee80211_rx_result
ieee80211_rx_h_remove_qos_control(struct ieee80211_txrx_data *rx) ieee80211_rx_h_remove_qos_control(struct ieee80211_rx_data *rx)
{ {
u16 fc = rx->fc; u16 fc = rx->fc;
u8 *data = rx->skb->data; u8 *data = rx->skb->data;
...@@ -1049,7 +1049,7 @@ ieee80211_rx_h_remove_qos_control(struct ieee80211_txrx_data *rx) ...@@ -1049,7 +1049,7 @@ ieee80211_rx_h_remove_qos_control(struct ieee80211_txrx_data *rx)
} }
static int static int
ieee80211_802_1x_port_control(struct ieee80211_txrx_data *rx) ieee80211_802_1x_port_control(struct ieee80211_rx_data *rx)
{ {
if (unlikely(!rx->sta || !(rx->sta->flags & WLAN_STA_AUTHORIZED))) { if (unlikely(!rx->sta || !(rx->sta->flags & WLAN_STA_AUTHORIZED))) {
#ifdef CONFIG_MAC80211_DEBUG #ifdef CONFIG_MAC80211_DEBUG
...@@ -1064,13 +1064,13 @@ ieee80211_802_1x_port_control(struct ieee80211_txrx_data *rx) ...@@ -1064,13 +1064,13 @@ ieee80211_802_1x_port_control(struct ieee80211_txrx_data *rx)
} }
static int static int
ieee80211_drop_unencrypted(struct ieee80211_txrx_data *rx) ieee80211_drop_unencrypted(struct ieee80211_rx_data *rx)
{ {
/* /*
* Pass through unencrypted frames if the hardware has * Pass through unencrypted frames if the hardware has
* decrypted them already. * decrypted them already.
*/ */
if (rx->u.rx.status->flag & RX_FLAG_DECRYPTED) if (rx->status->flag & RX_FLAG_DECRYPTED)
return 0; return 0;
/* Drop unencrypted frames if key is set. */ /* Drop unencrypted frames if key is set. */
...@@ -1087,7 +1087,7 @@ ieee80211_drop_unencrypted(struct ieee80211_txrx_data *rx) ...@@ -1087,7 +1087,7 @@ ieee80211_drop_unencrypted(struct ieee80211_txrx_data *rx)
} }
static int static int
ieee80211_data_to_8023(struct ieee80211_txrx_data *rx) ieee80211_data_to_8023(struct ieee80211_rx_data *rx)
{ {
struct net_device *dev = rx->dev; struct net_device *dev = rx->dev;
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) rx->skb->data; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) rx->skb->data;
...@@ -1235,7 +1235,7 @@ ieee80211_data_to_8023(struct ieee80211_txrx_data *rx) ...@@ -1235,7 +1235,7 @@ ieee80211_data_to_8023(struct ieee80211_txrx_data *rx)
/* /*
* requires that rx->skb is a frame with ethernet header * requires that rx->skb is a frame with ethernet header
*/ */
static bool ieee80211_frame_allowed(struct ieee80211_txrx_data *rx) static bool ieee80211_frame_allowed(struct ieee80211_rx_data *rx)
{ {
static const u8 pae_group_addr[ETH_ALEN] static const u8 pae_group_addr[ETH_ALEN]
= { 0x01, 0x80, 0xC2, 0x00, 0x00, 0x03 }; = { 0x01, 0x80, 0xC2, 0x00, 0x00, 0x03 };
...@@ -1261,7 +1261,7 @@ static bool ieee80211_frame_allowed(struct ieee80211_txrx_data *rx) ...@@ -1261,7 +1261,7 @@ static bool ieee80211_frame_allowed(struct ieee80211_txrx_data *rx)
* requires that rx->skb is a frame with ethernet header * requires that rx->skb is a frame with ethernet header
*/ */
static void static void
ieee80211_deliver_skb(struct ieee80211_txrx_data *rx) ieee80211_deliver_skb(struct ieee80211_rx_data *rx)
{ {
struct net_device *dev = rx->dev; struct net_device *dev = rx->dev;
struct ieee80211_local *local = rx->local; struct ieee80211_local *local = rx->local;
...@@ -1275,7 +1275,7 @@ ieee80211_deliver_skb(struct ieee80211_txrx_data *rx) ...@@ -1275,7 +1275,7 @@ ieee80211_deliver_skb(struct ieee80211_txrx_data *rx)
if (local->bridge_packets && (sdata->vif.type == IEEE80211_IF_TYPE_AP || if (local->bridge_packets && (sdata->vif.type == IEEE80211_IF_TYPE_AP ||
sdata->vif.type == IEEE80211_IF_TYPE_VLAN) && sdata->vif.type == IEEE80211_IF_TYPE_VLAN) &&
(rx->flags & IEEE80211_TXRXD_RXRA_MATCH)) { (rx->flags & IEEE80211_RX_RA_MATCH)) {
if (is_multicast_ether_addr(ehdr->h_dest)) { if (is_multicast_ether_addr(ehdr->h_dest)) {
/* /*
* send multicast frames both to higher layers in * send multicast frames both to higher layers in
...@@ -1351,7 +1351,7 @@ ieee80211_deliver_skb(struct ieee80211_txrx_data *rx) ...@@ -1351,7 +1351,7 @@ ieee80211_deliver_skb(struct ieee80211_txrx_data *rx)
} }
static ieee80211_rx_result static ieee80211_rx_result
ieee80211_rx_h_amsdu(struct ieee80211_txrx_data *rx) ieee80211_rx_h_amsdu(struct ieee80211_rx_data *rx)
{ {
struct net_device *dev = rx->dev; struct net_device *dev = rx->dev;
struct ieee80211_local *local = rx->local; struct ieee80211_local *local = rx->local;
...@@ -1371,7 +1371,7 @@ ieee80211_rx_h_amsdu(struct ieee80211_txrx_data *rx) ...@@ -1371,7 +1371,7 @@ ieee80211_rx_h_amsdu(struct ieee80211_txrx_data *rx)
if (unlikely(!WLAN_FC_DATA_PRESENT(fc))) if (unlikely(!WLAN_FC_DATA_PRESENT(fc)))
return RX_DROP_MONITOR; return RX_DROP_MONITOR;
if (!(rx->flags & IEEE80211_TXRXD_RX_AMSDU)) if (!(rx->flags & IEEE80211_RX_AMSDU))
return RX_CONTINUE; return RX_CONTINUE;
err = ieee80211_data_to_8023(rx); err = ieee80211_data_to_8023(rx);
...@@ -1468,7 +1468,7 @@ ieee80211_rx_h_amsdu(struct ieee80211_txrx_data *rx) ...@@ -1468,7 +1468,7 @@ ieee80211_rx_h_amsdu(struct ieee80211_txrx_data *rx)
} }
static ieee80211_rx_result static ieee80211_rx_result
ieee80211_rx_h_data(struct ieee80211_txrx_data *rx) ieee80211_rx_h_data(struct ieee80211_rx_data *rx)
{ {
struct net_device *dev = rx->dev; struct net_device *dev = rx->dev;
u16 fc; u16 fc;
...@@ -1499,7 +1499,7 @@ ieee80211_rx_h_data(struct ieee80211_txrx_data *rx) ...@@ -1499,7 +1499,7 @@ ieee80211_rx_h_data(struct ieee80211_txrx_data *rx)
} }
static ieee80211_rx_result static ieee80211_rx_result
ieee80211_rx_h_ctrl(struct ieee80211_txrx_data *rx) ieee80211_rx_h_ctrl(struct ieee80211_rx_data *rx)
{ {
struct ieee80211_local *local = rx->local; struct ieee80211_local *local = rx->local;
struct ieee80211_hw *hw = &local->hw; struct ieee80211_hw *hw = &local->hw;
...@@ -1542,11 +1542,11 @@ ieee80211_rx_h_ctrl(struct ieee80211_txrx_data *rx) ...@@ -1542,11 +1542,11 @@ ieee80211_rx_h_ctrl(struct ieee80211_txrx_data *rx)
} }
static ieee80211_rx_result static ieee80211_rx_result
ieee80211_rx_h_mgmt(struct ieee80211_txrx_data *rx) ieee80211_rx_h_mgmt(struct ieee80211_rx_data *rx)
{ {
struct ieee80211_sub_if_data *sdata; struct ieee80211_sub_if_data *sdata;
if (!(rx->flags & IEEE80211_TXRXD_RXRA_MATCH)) if (!(rx->flags & IEEE80211_RX_RA_MATCH))
return RX_DROP_MONITOR; return RX_DROP_MONITOR;
sdata = IEEE80211_DEV_TO_SUB_IF(rx->dev); sdata = IEEE80211_DEV_TO_SUB_IF(rx->dev);
...@@ -1554,7 +1554,7 @@ ieee80211_rx_h_mgmt(struct ieee80211_txrx_data *rx) ...@@ -1554,7 +1554,7 @@ ieee80211_rx_h_mgmt(struct ieee80211_txrx_data *rx)
sdata->vif.type == IEEE80211_IF_TYPE_IBSS || sdata->vif.type == IEEE80211_IF_TYPE_IBSS ||
sdata->vif.type == IEEE80211_IF_TYPE_MESH_POINT) && sdata->vif.type == IEEE80211_IF_TYPE_MESH_POINT) &&
!(sdata->flags & IEEE80211_SDATA_USERSPACE_MLME)) !(sdata->flags & IEEE80211_SDATA_USERSPACE_MLME))
ieee80211_sta_rx_mgmt(rx->dev, rx->skb, rx->u.rx.status); ieee80211_sta_rx_mgmt(rx->dev, rx->skb, rx->status);
else else
return RX_DROP_MONITOR; return RX_DROP_MONITOR;
...@@ -1563,7 +1563,7 @@ ieee80211_rx_h_mgmt(struct ieee80211_txrx_data *rx) ...@@ -1563,7 +1563,7 @@ ieee80211_rx_h_mgmt(struct ieee80211_txrx_data *rx)
static void ieee80211_rx_michael_mic_report(struct net_device *dev, static void ieee80211_rx_michael_mic_report(struct net_device *dev,
struct ieee80211_hdr *hdr, struct ieee80211_hdr *hdr,
struct ieee80211_txrx_data *rx) struct ieee80211_rx_data *rx)
{ {
int keyidx, hdrlen; int keyidx, hdrlen;
DECLARE_MAC_BUF(mac); DECLARE_MAC_BUF(mac);
...@@ -1633,7 +1633,8 @@ static void ieee80211_rx_michael_mic_report(struct net_device *dev, ...@@ -1633,7 +1633,8 @@ static void ieee80211_rx_michael_mic_report(struct net_device *dev,
rx->skb = NULL; rx->skb = NULL;
} }
static void ieee80211_rx_cooked_monitor(struct ieee80211_txrx_data *rx) /* TODO: use IEEE80211_RX_FRAGMENTED */
static void ieee80211_rx_cooked_monitor(struct ieee80211_rx_data *rx)
{ {
struct ieee80211_sub_if_data *sdata; struct ieee80211_sub_if_data *sdata;
struct ieee80211_local *local = rx->local; struct ieee80211_local *local = rx->local;
...@@ -1646,9 +1647,9 @@ static void ieee80211_rx_cooked_monitor(struct ieee80211_txrx_data *rx) ...@@ -1646,9 +1647,9 @@ static void ieee80211_rx_cooked_monitor(struct ieee80211_txrx_data *rx)
} __attribute__ ((packed)) *rthdr; } __attribute__ ((packed)) *rthdr;
struct sk_buff *skb = rx->skb, *skb2; struct sk_buff *skb = rx->skb, *skb2;
struct net_device *prev_dev = NULL; struct net_device *prev_dev = NULL;
struct ieee80211_rx_status *status = rx->u.rx.status; struct ieee80211_rx_status *status = rx->status;
if (rx->flags & IEEE80211_TXRXD_RX_CMNTR_REPORTED) if (rx->flags & IEEE80211_RX_CMNTR_REPORTED)
goto out_free_skb; goto out_free_skb;
if (skb_headroom(skb) < sizeof(*rthdr) && if (skb_headroom(skb) < sizeof(*rthdr) &&
...@@ -1663,7 +1664,7 @@ static void ieee80211_rx_cooked_monitor(struct ieee80211_txrx_data *rx) ...@@ -1663,7 +1664,7 @@ static void ieee80211_rx_cooked_monitor(struct ieee80211_txrx_data *rx)
(1 << IEEE80211_RADIOTAP_RATE) | (1 << IEEE80211_RADIOTAP_RATE) |
(1 << IEEE80211_RADIOTAP_CHANNEL)); (1 << IEEE80211_RADIOTAP_CHANNEL));
rthdr->rate = rx->u.rx.rate->bitrate / 5; rthdr->rate = rx->rate->bitrate / 5;
rthdr->chan_freq = cpu_to_le16(status->freq); rthdr->chan_freq = cpu_to_le16(status->freq);
if (status->band == IEEE80211_BAND_5GHZ) if (status->band == IEEE80211_BAND_5GHZ)
...@@ -1706,14 +1707,14 @@ static void ieee80211_rx_cooked_monitor(struct ieee80211_txrx_data *rx) ...@@ -1706,14 +1707,14 @@ static void ieee80211_rx_cooked_monitor(struct ieee80211_txrx_data *rx)
} else } else
goto out_free_skb; goto out_free_skb;
rx->flags |= IEEE80211_TXRXD_RX_CMNTR_REPORTED; rx->flags |= IEEE80211_RX_CMNTR_REPORTED;
return; return;
out_free_skb: out_free_skb:
dev_kfree_skb(skb); dev_kfree_skb(skb);
} }
typedef ieee80211_rx_result (*ieee80211_rx_handler)(struct ieee80211_txrx_data *); typedef ieee80211_rx_result (*ieee80211_rx_handler)(struct ieee80211_rx_data *);
static ieee80211_rx_handler ieee80211_rx_handlers[] = static ieee80211_rx_handler ieee80211_rx_handlers[] =
{ {
ieee80211_rx_h_if_stats, ieee80211_rx_h_if_stats,
...@@ -1737,7 +1738,7 @@ static ieee80211_rx_handler ieee80211_rx_handlers[] = ...@@ -1737,7 +1738,7 @@ static ieee80211_rx_handler ieee80211_rx_handlers[] =
}; };
static void ieee80211_invoke_rx_handlers(struct ieee80211_sub_if_data *sdata, static void ieee80211_invoke_rx_handlers(struct ieee80211_sub_if_data *sdata,
struct ieee80211_txrx_data *rx, struct ieee80211_rx_data *rx,
struct sk_buff *skb) struct sk_buff *skb)
{ {
ieee80211_rx_handler *handler; ieee80211_rx_handler *handler;
...@@ -1780,7 +1781,7 @@ static void ieee80211_invoke_rx_handlers(struct ieee80211_sub_if_data *sdata, ...@@ -1780,7 +1781,7 @@ static void ieee80211_invoke_rx_handlers(struct ieee80211_sub_if_data *sdata,
/* main receive path */ /* main receive path */
static int prepare_for_handlers(struct ieee80211_sub_if_data *sdata, static int prepare_for_handlers(struct ieee80211_sub_if_data *sdata,
u8 *bssid, struct ieee80211_txrx_data *rx, u8 *bssid, struct ieee80211_rx_data *rx,
struct ieee80211_hdr *hdr) struct ieee80211_hdr *hdr)
{ {
int multicast = is_multicast_ether_addr(hdr->addr1); int multicast = is_multicast_ether_addr(hdr->addr1);
...@@ -1790,15 +1791,15 @@ static int prepare_for_handlers(struct ieee80211_sub_if_data *sdata, ...@@ -1790,15 +1791,15 @@ 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->flags & IEEE80211_TXRXD_RXIN_SCAN)) if (!(rx->flags & IEEE80211_RX_IN_SCAN))
return 0; return 0;
rx->flags &= ~IEEE80211_TXRXD_RXRA_MATCH; rx->flags &= ~IEEE80211_RX_RA_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->dev->flags & IFF_PROMISC)) if (!(sdata->dev->flags & IFF_PROMISC))
return 0; return 0;
rx->flags &= ~IEEE80211_TXRXD_RXRA_MATCH; rx->flags &= ~IEEE80211_RX_RA_MATCH;
} }
break; break;
case IEEE80211_IF_TYPE_IBSS: case IEEE80211_IF_TYPE_IBSS:
...@@ -1808,15 +1809,15 @@ static int prepare_for_handlers(struct ieee80211_sub_if_data *sdata, ...@@ -1808,15 +1809,15 @@ static int prepare_for_handlers(struct ieee80211_sub_if_data *sdata,
(rx->fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_BEACON) (rx->fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_BEACON)
return 1; return 1;
else if (!ieee80211_bssid_match(bssid, sdata->u.sta.bssid)) { else if (!ieee80211_bssid_match(bssid, sdata->u.sta.bssid)) {
if (!(rx->flags & IEEE80211_TXRXD_RXIN_SCAN)) if (!(rx->flags & IEEE80211_RX_IN_SCAN))
return 0; return 0;
rx->flags &= ~IEEE80211_TXRXD_RXRA_MATCH; rx->flags &= ~IEEE80211_RX_RA_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->dev->flags & IFF_PROMISC)) if (!(sdata->dev->flags & IFF_PROMISC))
return 0; return 0;
rx->flags &= ~IEEE80211_TXRXD_RXRA_MATCH; rx->flags &= ~IEEE80211_RX_RA_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);
...@@ -1828,7 +1829,7 @@ static int prepare_for_handlers(struct ieee80211_sub_if_data *sdata, ...@@ -1828,7 +1829,7 @@ static int prepare_for_handlers(struct ieee80211_sub_if_data *sdata,
if (!(sdata->dev->flags & IFF_PROMISC)) if (!(sdata->dev->flags & IFF_PROMISC))
return 0; return 0;
rx->flags &= ~IEEE80211_TXRXD_RXRA_MATCH; rx->flags &= ~IEEE80211_RX_RA_MATCH;
} }
break; break;
case IEEE80211_IF_TYPE_VLAN: case IEEE80211_IF_TYPE_VLAN:
...@@ -1839,12 +1840,12 @@ static int prepare_for_handlers(struct ieee80211_sub_if_data *sdata, ...@@ -1839,12 +1840,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->flags & IEEE80211_TXRXD_RXIN_SCAN)) if (!(rx->flags & IEEE80211_RX_IN_SCAN))
return 0; return 0;
rx->flags &= ~IEEE80211_TXRXD_RXRA_MATCH; rx->flags &= ~IEEE80211_RX_RA_MATCH;
} }
if (sdata->dev == sdata->local->mdev && if (sdata->dev == sdata->local->mdev &&
!(rx->flags & IEEE80211_TXRXD_RXIN_SCAN)) !(rx->flags & IEEE80211_RX_IN_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;
...@@ -1881,7 +1882,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, ...@@ -1881,7 +1882,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
struct ieee80211_local *local = hw_to_local(hw); struct ieee80211_local *local = hw_to_local(hw);
struct ieee80211_sub_if_data *sdata; struct ieee80211_sub_if_data *sdata;
struct ieee80211_hdr *hdr; struct ieee80211_hdr *hdr;
struct ieee80211_txrx_data rx; struct ieee80211_rx_data rx;
u16 type; u16 type;
int prepares; int prepares;
struct ieee80211_sub_if_data *prev = NULL; struct ieee80211_sub_if_data *prev = NULL;
...@@ -1893,9 +1894,9 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, ...@@ -1893,9 +1894,9 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
rx.skb = skb; rx.skb = skb;
rx.local = local; rx.local = local;
rx.u.rx.status = status; rx.status = status;
rx.u.rx.load = load; rx.load = load;
rx.u.rx.rate = rate; rx.rate = rate;
rx.fc = le16_to_cpu(hdr->frame_control); rx.fc = le16_to_cpu(hdr->frame_control);
type = rx.fc & IEEE80211_FCTL_FTYPE; type = rx.fc & IEEE80211_FCTL_FTYPE;
...@@ -1914,7 +1915,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, ...@@ -1914,7 +1915,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
} }
if (unlikely(local->sta_sw_scanning || local->sta_hw_scanning)) if (unlikely(local->sta_sw_scanning || local->sta_hw_scanning))
rx.flags |= IEEE80211_TXRXD_RXIN_SCAN; rx.flags |= IEEE80211_RX_IN_SCAN;
ieee80211_parse_qos(&rx); ieee80211_parse_qos(&rx);
ieee80211_verify_ip_alignment(&rx); ieee80211_verify_ip_alignment(&rx);
...@@ -1929,7 +1930,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, ...@@ -1929,7 +1930,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
continue; continue;
bssid = ieee80211_get_bssid(hdr, skb->len, sdata->vif.type); bssid = ieee80211_get_bssid(hdr, skb->len, sdata->vif.type);
rx.flags |= IEEE80211_TXRXD_RXRA_MATCH; rx.flags |= IEEE80211_RX_RA_MATCH;
prepares = prepare_for_handlers(sdata, bssid, &rx, hdr); prepares = prepare_for_handlers(sdata, bssid, &rx, hdr);
if (!prepares) if (!prepares)
......
net/mac80211/tx.c
View file @ 5cf121c3
...@@ -87,11 +87,11 @@ static inline void ieee80211_dump_frame(const char *ifname, const char *title, ...@@ -87,11 +87,11 @@ static inline void ieee80211_dump_frame(const char *ifname, const char *title,
} }
#endif /* CONFIG_MAC80211_LOWTX_FRAME_DUMP */ #endif /* CONFIG_MAC80211_LOWTX_FRAME_DUMP */
static u16 ieee80211_duration(struct ieee80211_txrx_data *tx, int group_addr, static u16 ieee80211_duration(struct ieee80211_tx_data *tx, int group_addr,
int next_frag_len) int next_frag_len)
{ {
int rate, mrate, erp, dur, i; int rate, mrate, erp, dur, i;
struct ieee80211_rate *txrate = tx->u.tx.rate; struct ieee80211_rate *txrate = tx->rate;
struct ieee80211_local *local = tx->local; struct ieee80211_local *local = tx->local;
struct ieee80211_supported_band *sband; struct ieee80211_supported_band *sband;
...@@ -234,7 +234,7 @@ static int inline is_ieee80211_device(struct net_device *dev, ...@@ -234,7 +234,7 @@ static int inline is_ieee80211_device(struct net_device *dev,
/* tx handlers */ /* tx handlers */
static ieee80211_tx_result static ieee80211_tx_result
ieee80211_tx_h_check_assoc(struct ieee80211_txrx_data *tx) ieee80211_tx_h_check_assoc(struct ieee80211_tx_data *tx)
{ {
#ifdef CONFIG_MAC80211_VERBOSE_DEBUG #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
struct sk_buff *skb = tx->skb; struct sk_buff *skb = tx->skb;
...@@ -242,7 +242,7 @@ ieee80211_tx_h_check_assoc(struct ieee80211_txrx_data *tx) ...@@ -242,7 +242,7 @@ ieee80211_tx_h_check_assoc(struct ieee80211_txrx_data *tx)
#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */ #endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
u32 sta_flags; u32 sta_flags;
if (unlikely(tx->flags & IEEE80211_TXRXD_TX_INJECTED)) if (unlikely(tx->flags & IEEE80211_TX_INJECTED))
return TX_CONTINUE; return TX_CONTINUE;
if (unlikely(tx->local->sta_sw_scanning) && if (unlikely(tx->local->sta_sw_scanning) &&
...@@ -253,12 +253,12 @@ ieee80211_tx_h_check_assoc(struct ieee80211_txrx_data *tx) ...@@ -253,12 +253,12 @@ ieee80211_tx_h_check_assoc(struct ieee80211_txrx_data *tx)
if (tx->sdata->vif.type == IEEE80211_IF_TYPE_MESH_POINT) if (tx->sdata->vif.type == IEEE80211_IF_TYPE_MESH_POINT)
return TX_CONTINUE; return TX_CONTINUE;
if (tx->flags & IEEE80211_TXRXD_TXPS_BUFFERED) if (tx->flags & IEEE80211_TX_PS_BUFFERED)
return TX_CONTINUE; return TX_CONTINUE;
sta_flags = tx->sta ? tx->sta->flags : 0; sta_flags = tx->sta ? tx->sta->flags : 0;
if (likely(tx->flags & IEEE80211_TXRXD_TXUNICAST)) { if (likely(tx->flags & IEEE80211_TX_UNICAST)) {
if (unlikely(!(sta_flags & WLAN_STA_ASSOC) && if (unlikely(!(sta_flags & WLAN_STA_ASSOC) &&
tx->sdata->vif.type != IEEE80211_IF_TYPE_IBSS && tx->sdata->vif.type != IEEE80211_IF_TYPE_IBSS &&
(tx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA)) { (tx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA)) {
...@@ -288,7 +288,7 @@ ieee80211_tx_h_check_assoc(struct ieee80211_txrx_data *tx) ...@@ -288,7 +288,7 @@ ieee80211_tx_h_check_assoc(struct ieee80211_txrx_data *tx)
} }
static ieee80211_tx_result static ieee80211_tx_result
ieee80211_tx_h_sequence(struct ieee80211_txrx_data *tx) ieee80211_tx_h_sequence(struct ieee80211_tx_data *tx)
{ {
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx->skb->data; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx->skb->data;
...@@ -346,7 +346,7 @@ static void purge_old_ps_buffers(struct ieee80211_local *local) ...@@ -346,7 +346,7 @@ static void purge_old_ps_buffers(struct ieee80211_local *local)
} }
static ieee80211_tx_result static ieee80211_tx_result
ieee80211_tx_h_multicast_ps_buf(struct ieee80211_txrx_data *tx) ieee80211_tx_h_multicast_ps_buf(struct ieee80211_tx_data *tx)
{ {
/* /*
* broadcast/multicast frame * broadcast/multicast frame
...@@ -383,13 +383,13 @@ ieee80211_tx_h_multicast_ps_buf(struct ieee80211_txrx_data *tx) ...@@ -383,13 +383,13 @@ ieee80211_tx_h_multicast_ps_buf(struct ieee80211_txrx_data *tx)
} }
/* buffered in hardware */ /* buffered in hardware */
tx->u.tx.control->flags |= IEEE80211_TXCTL_SEND_AFTER_DTIM; tx->control->flags |= IEEE80211_TXCTL_SEND_AFTER_DTIM;
return TX_CONTINUE; return TX_CONTINUE;
} }
static ieee80211_tx_result static ieee80211_tx_result
ieee80211_tx_h_unicast_ps_buf(struct ieee80211_txrx_data *tx) ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx)
{ {
struct sta_info *sta = tx->sta; struct sta_info *sta = tx->sta;
DECLARE_MAC_BUF(mac); DECLARE_MAC_BUF(mac);
...@@ -443,32 +443,32 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_txrx_data *tx) ...@@ -443,32 +443,32 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_txrx_data *tx)
} }
static ieee80211_tx_result static ieee80211_tx_result
ieee80211_tx_h_ps_buf(struct ieee80211_txrx_data *tx) ieee80211_tx_h_ps_buf(struct ieee80211_tx_data *tx)
{ {
if (unlikely(tx->flags & IEEE80211_TXRXD_TXPS_BUFFERED)) if (unlikely(tx->flags & IEEE80211_TX_PS_BUFFERED))
return TX_CONTINUE; return TX_CONTINUE;
if (tx->flags & IEEE80211_TXRXD_TXUNICAST) if (tx->flags & IEEE80211_TX_UNICAST)
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);
} }
static ieee80211_tx_result static ieee80211_tx_result
ieee80211_tx_h_select_key(struct ieee80211_txrx_data *tx) ieee80211_tx_h_select_key(struct ieee80211_tx_data *tx)
{ {
struct ieee80211_key *key; struct ieee80211_key *key;
u16 fc = tx->fc; u16 fc = tx->fc;
if (unlikely(tx->u.tx.control->flags & IEEE80211_TXCTL_DO_NOT_ENCRYPT)) if (unlikely(tx->control->flags & IEEE80211_TXCTL_DO_NOT_ENCRYPT))
tx->key = NULL; tx->key = NULL;
else if (tx->sta && (key = rcu_dereference(tx->sta->key))) else if (tx->sta && (key = rcu_dereference(tx->sta->key)))
tx->key = key; tx->key = key;
else if ((key = rcu_dereference(tx->sdata->default_key))) else if ((key = rcu_dereference(tx->sdata->default_key)))
tx->key = key; tx->key = key;
else if (tx->sdata->drop_unencrypted && else if (tx->sdata->drop_unencrypted &&
!(tx->u.tx.control->flags & IEEE80211_TXCTL_EAPOL_FRAME) && !(tx->control->flags & IEEE80211_TXCTL_EAPOL_FRAME) &&
!(tx->flags & IEEE80211_TXRXD_TX_INJECTED)) { !(tx->flags & IEEE80211_TX_INJECTED)) {
I802_DEBUG_INC(tx->local->tx_handlers_drop_unencrypted); I802_DEBUG_INC(tx->local->tx_handlers_drop_unencrypted);
return TX_DROP; return TX_DROP;
} else } else
...@@ -497,13 +497,13 @@ ieee80211_tx_h_select_key(struct ieee80211_txrx_data *tx) ...@@ -497,13 +497,13 @@ ieee80211_tx_h_select_key(struct ieee80211_txrx_data *tx)
} }
if (!tx->key || !(tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE)) if (!tx->key || !(tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE))
tx->u.tx.control->flags |= IEEE80211_TXCTL_DO_NOT_ENCRYPT; tx->control->flags |= IEEE80211_TXCTL_DO_NOT_ENCRYPT;
return TX_CONTINUE; return TX_CONTINUE;
} }
static ieee80211_tx_result static ieee80211_tx_result
ieee80211_tx_h_fragment(struct ieee80211_txrx_data *tx) ieee80211_tx_h_fragment(struct ieee80211_tx_data *tx)
{ {
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) tx->skb->data; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) tx->skb->data;
size_t hdrlen, per_fragm, num_fragm, payload_len, left; size_t hdrlen, per_fragm, num_fragm, payload_len, left;
...@@ -513,7 +513,7 @@ ieee80211_tx_h_fragment(struct ieee80211_txrx_data *tx) ...@@ -513,7 +513,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->flags & IEEE80211_TXRXD_FRAGMENTED)) if (!(tx->flags & IEEE80211_TX_FRAGMENTED))
return TX_CONTINUE; return TX_CONTINUE;
first = tx->skb; first = tx->skb;
...@@ -565,8 +565,8 @@ ieee80211_tx_h_fragment(struct ieee80211_txrx_data *tx) ...@@ -565,8 +565,8 @@ ieee80211_tx_h_fragment(struct ieee80211_txrx_data *tx)
} }
skb_trim(first, hdrlen + per_fragm); skb_trim(first, hdrlen + per_fragm);
tx->u.tx.num_extra_frag = num_fragm - 1; tx->num_extra_frag = num_fragm - 1;
tx->u.tx.extra_frag = frags; tx->extra_frag = frags;
return TX_CONTINUE; return TX_CONTINUE;
...@@ -583,7 +583,7 @@ ieee80211_tx_h_fragment(struct ieee80211_txrx_data *tx) ...@@ -583,7 +583,7 @@ ieee80211_tx_h_fragment(struct ieee80211_txrx_data *tx)
} }
static ieee80211_tx_result static ieee80211_tx_result
ieee80211_tx_h_encrypt(struct ieee80211_txrx_data *tx) ieee80211_tx_h_encrypt(struct ieee80211_tx_data *tx)
{ {
if (!tx->key) if (!tx->key)
return TX_CONTINUE; return TX_CONTINUE;
...@@ -603,56 +603,56 @@ ieee80211_tx_h_encrypt(struct ieee80211_txrx_data *tx) ...@@ -603,56 +603,56 @@ ieee80211_tx_h_encrypt(struct ieee80211_txrx_data *tx)
} }
static ieee80211_tx_result static ieee80211_tx_result
ieee80211_tx_h_rate_ctrl(struct ieee80211_txrx_data *tx) ieee80211_tx_h_rate_ctrl(struct ieee80211_tx_data *tx)
{ {
struct rate_selection rsel; struct rate_selection rsel;
struct ieee80211_supported_band *sband; struct ieee80211_supported_band *sband;
sband = tx->local->hw.wiphy->bands[tx->local->hw.conf.channel->band]; sband = tx->local->hw.wiphy->bands[tx->local->hw.conf.channel->band];
if (likely(!tx->u.tx.rate)) { if (likely(!tx->rate)) {
rate_control_get_rate(tx->dev, sband, tx->skb, &rsel); rate_control_get_rate(tx->dev, sband, tx->skb, &rsel);
tx->u.tx.rate = rsel.rate; tx->rate = rsel.rate;
if (unlikely(rsel.probe)) { if (unlikely(rsel.probe)) {
tx->u.tx.control->flags |= tx->control->flags |=
IEEE80211_TXCTL_RATE_CTRL_PROBE; IEEE80211_TXCTL_RATE_CTRL_PROBE;
tx->flags |= IEEE80211_TXRXD_TXPROBE_LAST_FRAG; tx->flags |= IEEE80211_TX_PROBE_LAST_FRAG;
tx->u.tx.control->alt_retry_rate = tx->u.tx.rate; tx->control->alt_retry_rate = tx->rate;
tx->u.tx.rate = rsel.probe; tx->rate = rsel.probe;
} else } else
tx->u.tx.control->alt_retry_rate = NULL; tx->control->alt_retry_rate = NULL;
if (!tx->u.tx.rate) if (!tx->rate)
return TX_DROP; return TX_DROP;
} else } else
tx->u.tx.control->alt_retry_rate = NULL; tx->control->alt_retry_rate = NULL;
if (tx->sdata->bss_conf.use_cts_prot && if (tx->sdata->bss_conf.use_cts_prot &&
(tx->flags & IEEE80211_TXRXD_FRAGMENTED) && rsel.nonerp) { (tx->flags & IEEE80211_TX_FRAGMENTED) && rsel.nonerp) {
tx->u.tx.last_frag_rate = tx->u.tx.rate; tx->last_frag_rate = tx->rate;
if (rsel.probe) if (rsel.probe)
tx->flags &= ~IEEE80211_TXRXD_TXPROBE_LAST_FRAG; tx->flags &= ~IEEE80211_TX_PROBE_LAST_FRAG;
else else
tx->flags |= IEEE80211_TXRXD_TXPROBE_LAST_FRAG; tx->flags |= IEEE80211_TX_PROBE_LAST_FRAG;
tx->u.tx.rate = rsel.nonerp; tx->rate = rsel.nonerp;
tx->u.tx.control->tx_rate = rsel.nonerp; tx->control->tx_rate = rsel.nonerp;
tx->u.tx.control->flags &= ~IEEE80211_TXCTL_RATE_CTRL_PROBE; tx->control->flags &= ~IEEE80211_TXCTL_RATE_CTRL_PROBE;
} else { } else {
tx->u.tx.last_frag_rate = tx->u.tx.rate; tx->last_frag_rate = tx->rate;
tx->u.tx.control->tx_rate = tx->u.tx.rate; tx->control->tx_rate = tx->rate;
} }
tx->u.tx.control->tx_rate = tx->u.tx.rate; tx->control->tx_rate = tx->rate;
return TX_CONTINUE; return TX_CONTINUE;
} }
static ieee80211_tx_result static ieee80211_tx_result
ieee80211_tx_h_misc(struct ieee80211_txrx_data *tx) ieee80211_tx_h_misc(struct ieee80211_tx_data *tx)
{ {
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) tx->skb->data; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) tx->skb->data;
u16 fc = le16_to_cpu(hdr->frame_control); u16 fc = le16_to_cpu(hdr->frame_control);
u16 dur; u16 dur;
struct ieee80211_tx_control *control = tx->u.tx.control; struct ieee80211_tx_control *control = tx->control;
if (!control->retry_limit) { if (!control->retry_limit) {
if (!is_multicast_ether_addr(hdr->addr1)) { if (!is_multicast_ether_addr(hdr->addr1)) {
...@@ -674,7 +674,7 @@ ieee80211_tx_h_misc(struct ieee80211_txrx_data *tx) ...@@ -674,7 +674,7 @@ ieee80211_tx_h_misc(struct ieee80211_txrx_data *tx)
} }
} }
if (tx->flags & IEEE80211_TXRXD_FRAGMENTED) { if (tx->flags & IEEE80211_TX_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
...@@ -686,8 +686,8 @@ ieee80211_tx_h_misc(struct ieee80211_txrx_data *tx) ...@@ -686,8 +686,8 @@ ieee80211_tx_h_misc(struct ieee80211_txrx_data *tx)
* there are associated non-ERP stations and RTS/CTS is not configured * there are associated non-ERP stations and RTS/CTS is not configured
* for the frame. */ * for the frame. */
if ((tx->sdata->flags & IEEE80211_SDATA_OPERATING_GMODE) && if ((tx->sdata->flags & IEEE80211_SDATA_OPERATING_GMODE) &&
(tx->u.tx.rate->flags & IEEE80211_RATE_ERP_G) && (tx->rate->flags & IEEE80211_RATE_ERP_G) &&
(tx->flags & IEEE80211_TXRXD_TXUNICAST) && (tx->flags & IEEE80211_TX_UNICAST) &&
tx->sdata->bss_conf.use_cts_prot && tx->sdata->bss_conf.use_cts_prot &&
!(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;
...@@ -696,18 +696,18 @@ ieee80211_tx_h_misc(struct ieee80211_txrx_data *tx) ...@@ -696,18 +696,18 @@ ieee80211_tx_h_misc(struct ieee80211_txrx_data *tx)
* short preambles at the selected rate and short preambles are * short preambles at the selected rate and short preambles are
* available on the network at the current point in time. */ * available on the network at the current point in time. */
if (((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA) && if (((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA) &&
(tx->u.tx.rate->flags & IEEE80211_RATE_SHORT_PREAMBLE) && (tx->rate->flags & IEEE80211_RATE_SHORT_PREAMBLE) &&
tx->sdata->bss_conf.use_short_preamble && tx->sdata->bss_conf.use_short_preamble &&
(!tx->sta || (tx->sta->flags & WLAN_STA_SHORT_PREAMBLE))) { (!tx->sta || (tx->sta->flags & WLAN_STA_SHORT_PREAMBLE))) {
tx->u.tx.control->flags |= IEEE80211_TXCTL_SHORT_PREAMBLE; tx->control->flags |= IEEE80211_TXCTL_SHORT_PREAMBLE;
} }
/* Setup duration field for the first fragment of the frame. Duration /* Setup duration field for the first fragment of the frame. Duration
* 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->flags & IEEE80211_TXRXD_FRAGMENTED) ? (tx->flags & IEEE80211_TX_FRAGMENTED) ?
tx->u.tx.extra_frag[0]->len : 0); 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) ||
...@@ -723,7 +723,7 @@ ieee80211_tx_h_misc(struct ieee80211_txrx_data *tx) ...@@ -723,7 +723,7 @@ ieee80211_tx_h_misc(struct ieee80211_txrx_data *tx)
control->alt_retry_rate = NULL; control->alt_retry_rate = NULL;
/* Use min(data rate, max base rate) as CTS/RTS rate */ /* Use min(data rate, max base rate) as CTS/RTS rate */
rate = tx->u.tx.rate; rate = tx->rate;
baserate = NULL; baserate = NULL;
for (idx = 0; idx < sband->n_bitrates; idx++) { for (idx = 0; idx < sband->n_bitrates; idx++) {
...@@ -745,12 +745,12 @@ ieee80211_tx_h_misc(struct ieee80211_txrx_data *tx) ...@@ -745,12 +745,12 @@ ieee80211_tx_h_misc(struct ieee80211_txrx_data *tx)
tx->sta->tx_packets++; tx->sta->tx_packets++;
tx->sta->tx_fragments++; tx->sta->tx_fragments++;
tx->sta->tx_bytes += tx->skb->len; tx->sta->tx_bytes += tx->skb->len;
if (tx->u.tx.extra_frag) { if (tx->extra_frag) {
int i; int i;
tx->sta->tx_fragments += tx->u.tx.num_extra_frag; tx->sta->tx_fragments += tx->num_extra_frag;
for (i = 0; i < tx->u.tx.num_extra_frag; i++) { for (i = 0; i < tx->num_extra_frag; i++) {
tx->sta->tx_bytes += tx->sta->tx_bytes +=
tx->u.tx.extra_frag[i]->len; tx->extra_frag[i]->len;
} }
} }
} }
...@@ -759,13 +759,13 @@ ieee80211_tx_h_misc(struct ieee80211_txrx_data *tx) ...@@ -759,13 +759,13 @@ ieee80211_tx_h_misc(struct ieee80211_txrx_data *tx)
} }
static ieee80211_tx_result static ieee80211_tx_result
ieee80211_tx_h_load_stats(struct ieee80211_txrx_data *tx) ieee80211_tx_h_load_stats(struct ieee80211_tx_data *tx)
{ {
struct ieee80211_local *local = tx->local; struct ieee80211_local *local = tx->local;
struct sk_buff *skb = tx->skb; struct sk_buff *skb = tx->skb;
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
u32 load = 0, hdrtime; u32 load = 0, hdrtime;
struct ieee80211_rate *rate = tx->u.tx.rate; struct ieee80211_rate *rate = tx->rate;
/* TODO: this could be part of tx_status handling, so that the number /* TODO: this could be part of tx_status handling, so that the number
* of retries would be known; TX rate should in that case be stored * of retries would be known; TX rate should in that case be stored
...@@ -776,8 +776,8 @@ ieee80211_tx_h_load_stats(struct ieee80211_txrx_data *tx) ...@@ -776,8 +776,8 @@ ieee80211_tx_h_load_stats(struct ieee80211_txrx_data *tx)
/* 1 bit at 1 Mbit/s takes 1 usec; in channel_use values, /* 1 bit at 1 Mbit/s takes 1 usec; in channel_use values,
* 1 usec = 1/8 * (1080 / 10) = 13.5 */ * 1 usec = 1/8 * (1080 / 10) = 13.5 */
if (tx->u.tx.channel->band == IEEE80211_BAND_5GHZ || if (tx->channel->band == IEEE80211_BAND_5GHZ ||
(tx->u.tx.channel->band == IEEE80211_BAND_2GHZ && (tx->channel->band == IEEE80211_BAND_2GHZ &&
rate->flags & IEEE80211_RATE_ERP_G)) rate->flags & IEEE80211_RATE_ERP_G))
hdrtime = CHAN_UTIL_HDR_SHORT; hdrtime = CHAN_UTIL_HDR_SHORT;
else else
...@@ -787,20 +787,20 @@ ieee80211_tx_h_load_stats(struct ieee80211_txrx_data *tx) ...@@ -787,20 +787,20 @@ ieee80211_tx_h_load_stats(struct ieee80211_txrx_data *tx)
if (!is_multicast_ether_addr(hdr->addr1)) if (!is_multicast_ether_addr(hdr->addr1))
load += hdrtime; load += hdrtime;
if (tx->u.tx.control->flags & IEEE80211_TXCTL_USE_RTS_CTS) if (tx->control->flags & IEEE80211_TXCTL_USE_RTS_CTS)
load += 2 * hdrtime; load += 2 * hdrtime;
else if (tx->u.tx.control->flags & IEEE80211_TXCTL_USE_CTS_PROTECT) else if (tx->control->flags & IEEE80211_TXCTL_USE_CTS_PROTECT)
load += hdrtime; load += hdrtime;
/* TODO: optimise again */ /* TODO: optimise again */
load += skb->len * CHAN_UTIL_RATE_LCM / rate->bitrate; load += skb->len * CHAN_UTIL_RATE_LCM / rate->bitrate;
if (tx->u.tx.extra_frag) { if (tx->extra_frag) {
int i; int i;
for (i = 0; i < tx->u.tx.num_extra_frag; i++) { for (i = 0; i < tx->num_extra_frag; i++) {
load += 2 * hdrtime; load += 2 * hdrtime;
load += tx->u.tx.extra_frag[i]->len * load += tx->extra_frag[i]->len *
tx->u.tx.rate->bitrate; tx->rate->bitrate;
} }
} }
...@@ -815,7 +815,7 @@ ieee80211_tx_h_load_stats(struct ieee80211_txrx_data *tx) ...@@ -815,7 +815,7 @@ ieee80211_tx_h_load_stats(struct ieee80211_txrx_data *tx)
} }
typedef ieee80211_tx_result (*ieee80211_tx_handler)(struct ieee80211_txrx_data *); typedef ieee80211_tx_result (*ieee80211_tx_handler)(struct ieee80211_tx_data *);
static ieee80211_tx_handler ieee80211_tx_handlers[] = static ieee80211_tx_handler ieee80211_tx_handlers[] =
{ {
ieee80211_tx_h_check_assoc, ieee80211_tx_h_check_assoc,
...@@ -838,7 +838,7 @@ static ieee80211_tx_handler ieee80211_tx_handlers[] = ...@@ -838,7 +838,7 @@ static ieee80211_tx_handler ieee80211_tx_handlers[] =
* with Radiotap Header -- only called for monitor mode interface * with Radiotap Header -- only called for monitor mode interface
*/ */
static ieee80211_tx_result static ieee80211_tx_result
__ieee80211_parse_tx_radiotap(struct ieee80211_txrx_data *tx, __ieee80211_parse_tx_radiotap(struct ieee80211_tx_data *tx,
struct sk_buff *skb) struct sk_buff *skb)
{ {
/* /*
...@@ -854,13 +854,13 @@ __ieee80211_parse_tx_radiotap(struct ieee80211_txrx_data *tx, ...@@ -854,13 +854,13 @@ __ieee80211_parse_tx_radiotap(struct ieee80211_txrx_data *tx,
(struct ieee80211_radiotap_header *) skb->data; (struct ieee80211_radiotap_header *) skb->data;
struct ieee80211_supported_band *sband; struct ieee80211_supported_band *sband;
int ret = ieee80211_radiotap_iterator_init(&iterator, rthdr, skb->len); int ret = ieee80211_radiotap_iterator_init(&iterator, rthdr, skb->len);
struct ieee80211_tx_control *control = tx->u.tx.control; struct ieee80211_tx_control *control = tx->control;
sband = tx->local->hw.wiphy->bands[tx->local->hw.conf.channel->band]; sband = tx->local->hw.wiphy->bands[tx->local->hw.conf.channel->band];
control->flags |= IEEE80211_TXCTL_DO_NOT_ENCRYPT; control->flags |= IEEE80211_TXCTL_DO_NOT_ENCRYPT;
tx->flags |= IEEE80211_TXRXD_TX_INJECTED; tx->flags |= IEEE80211_TX_INJECTED;
tx->flags &= ~IEEE80211_TXRXD_FRAGMENTED; tx->flags &= ~IEEE80211_TX_FRAGMENTED;
/* /*
* for every radiotap entry that is present * for every radiotap entry that is present
...@@ -896,7 +896,7 @@ __ieee80211_parse_tx_radiotap(struct ieee80211_txrx_data *tx, ...@@ -896,7 +896,7 @@ __ieee80211_parse_tx_radiotap(struct ieee80211_txrx_data *tx,
r = &sband->bitrates[i]; r = &sband->bitrates[i];
if (r->bitrate == target_rate) { if (r->bitrate == target_rate) {
tx->u.tx.rate = r; tx->rate = r;
break; break;
} }
} }
...@@ -934,7 +934,7 @@ __ieee80211_parse_tx_radiotap(struct ieee80211_txrx_data *tx, ...@@ -934,7 +934,7 @@ __ieee80211_parse_tx_radiotap(struct ieee80211_txrx_data *tx,
control->flags &= control->flags &=
~IEEE80211_TXCTL_DO_NOT_ENCRYPT; ~IEEE80211_TXCTL_DO_NOT_ENCRYPT;
if (*iterator.this_arg & IEEE80211_RADIOTAP_F_FRAG) if (*iterator.this_arg & IEEE80211_RADIOTAP_F_FRAG)
tx->flags |= IEEE80211_TXRXD_FRAGMENTED; tx->flags |= IEEE80211_TX_FRAGMENTED;
break; break;
/* /*
...@@ -965,7 +965,7 @@ __ieee80211_parse_tx_radiotap(struct ieee80211_txrx_data *tx, ...@@ -965,7 +965,7 @@ __ieee80211_parse_tx_radiotap(struct ieee80211_txrx_data *tx,
* initialises @tx * initialises @tx
*/ */
static ieee80211_tx_result static ieee80211_tx_result
__ieee80211_tx_prepare(struct ieee80211_txrx_data *tx, __ieee80211_tx_prepare(struct ieee80211_tx_data *tx,
struct sk_buff *skb, struct sk_buff *skb,
struct net_device *dev, struct net_device *dev,
struct ieee80211_tx_control *control) struct ieee80211_tx_control *control)
...@@ -981,12 +981,12 @@ __ieee80211_tx_prepare(struct ieee80211_txrx_data *tx, ...@@ -981,12 +981,12 @@ __ieee80211_tx_prepare(struct ieee80211_txrx_data *tx,
tx->dev = dev; /* use original interface */ tx->dev = dev; /* use original interface */
tx->local = local; tx->local = local;
tx->sdata = IEEE80211_DEV_TO_SUB_IF(dev); tx->sdata = IEEE80211_DEV_TO_SUB_IF(dev);
tx->u.tx.control = control; tx->control = control;
/* /*
* Set this flag (used below to indicate "automatic fragmentation"), * Set this flag (used below to indicate "automatic fragmentation"),
* it will be cleared/left by radiotap as desired. * it will be cleared/left by radiotap as desired.
*/ */
tx->flags |= IEEE80211_TXRXD_FRAGMENTED; tx->flags |= IEEE80211_TX_FRAGMENTED;
/* process and remove the injection radiotap header */ /* process and remove the injection radiotap header */
sdata = IEEE80211_DEV_TO_SUB_IF(dev); sdata = IEEE80211_DEV_TO_SUB_IF(dev);
...@@ -1007,20 +1007,20 @@ __ieee80211_tx_prepare(struct ieee80211_txrx_data *tx, ...@@ -1007,20 +1007,20 @@ __ieee80211_tx_prepare(struct ieee80211_txrx_data *tx,
tx->fc = le16_to_cpu(hdr->frame_control); tx->fc = le16_to_cpu(hdr->frame_control);
if (is_multicast_ether_addr(hdr->addr1)) { if (is_multicast_ether_addr(hdr->addr1)) {
tx->flags &= ~IEEE80211_TXRXD_TXUNICAST; tx->flags &= ~IEEE80211_TX_UNICAST;
control->flags |= IEEE80211_TXCTL_NO_ACK; control->flags |= IEEE80211_TXCTL_NO_ACK;
} else { } else {
tx->flags |= IEEE80211_TXRXD_TXUNICAST; tx->flags |= IEEE80211_TX_UNICAST;
control->flags &= ~IEEE80211_TXCTL_NO_ACK; control->flags &= ~IEEE80211_TXCTL_NO_ACK;
} }
if (tx->flags & IEEE80211_TXRXD_FRAGMENTED) { if (tx->flags & IEEE80211_TX_FRAGMENTED) {
if ((tx->flags & IEEE80211_TXRXD_TXUNICAST) && if ((tx->flags & IEEE80211_TX_UNICAST) &&
skb->len + FCS_LEN > local->fragmentation_threshold && skb->len + FCS_LEN > local->fragmentation_threshold &&
!local->ops->set_frag_threshold) !local->ops->set_frag_threshold)
tx->flags |= IEEE80211_TXRXD_FRAGMENTED; tx->flags |= IEEE80211_TX_FRAGMENTED;
else else
tx->flags &= ~IEEE80211_TXRXD_FRAGMENTED; tx->flags &= ~IEEE80211_TX_FRAGMENTED;
} }
if (!tx->sta) if (!tx->sta)
...@@ -1043,7 +1043,7 @@ __ieee80211_tx_prepare(struct ieee80211_txrx_data *tx, ...@@ -1043,7 +1043,7 @@ __ieee80211_tx_prepare(struct ieee80211_txrx_data *tx,
/* /*
* NB: @tx is uninitialised when passed in here * NB: @tx is uninitialised when passed in here
*/ */
static int ieee80211_tx_prepare(struct ieee80211_txrx_data *tx, static int ieee80211_tx_prepare(struct ieee80211_tx_data *tx,
struct sk_buff *skb, struct sk_buff *skb,
struct net_device *mdev, struct net_device *mdev,
struct ieee80211_tx_control *control) struct ieee80211_tx_control *control)
...@@ -1066,9 +1066,9 @@ static int ieee80211_tx_prepare(struct ieee80211_txrx_data *tx, ...@@ -1066,9 +1066,9 @@ static int ieee80211_tx_prepare(struct ieee80211_txrx_data *tx,
} }
static int __ieee80211_tx(struct ieee80211_local *local, struct sk_buff *skb, static int __ieee80211_tx(struct ieee80211_local *local, struct sk_buff *skb,
struct ieee80211_txrx_data *tx) struct ieee80211_tx_data *tx)
{ {
struct ieee80211_tx_control *control = tx->u.tx.control; struct ieee80211_tx_control *control = tx->control;
int ret, i; int ret, i;
if (!ieee80211_qdisc_installed(local->mdev) && if (!ieee80211_qdisc_installed(local->mdev) &&
...@@ -1085,20 +1085,20 @@ static int __ieee80211_tx(struct ieee80211_local *local, struct sk_buff *skb, ...@@ -1085,20 +1085,20 @@ static int __ieee80211_tx(struct ieee80211_local *local, struct sk_buff *skb,
local->mdev->trans_start = jiffies; local->mdev->trans_start = jiffies;
ieee80211_led_tx(local, 1); ieee80211_led_tx(local, 1);
} }
if (tx->u.tx.extra_frag) { if (tx->extra_frag) {
control->flags &= ~(IEEE80211_TXCTL_USE_RTS_CTS | control->flags &= ~(IEEE80211_TXCTL_USE_RTS_CTS |
IEEE80211_TXCTL_USE_CTS_PROTECT | IEEE80211_TXCTL_USE_CTS_PROTECT |
IEEE80211_TXCTL_CLEAR_PS_FILT | IEEE80211_TXCTL_CLEAR_PS_FILT |
IEEE80211_TXCTL_FIRST_FRAGMENT); IEEE80211_TXCTL_FIRST_FRAGMENT);
for (i = 0; i < tx->u.tx.num_extra_frag; i++) { for (i = 0; i < tx->num_extra_frag; i++) {
if (!tx->u.tx.extra_frag[i]) if (!tx->extra_frag[i])
continue; continue;
if (__ieee80211_queue_stopped(local, control->queue)) if (__ieee80211_queue_stopped(local, control->queue))
return IEEE80211_TX_FRAG_AGAIN; return IEEE80211_TX_FRAG_AGAIN;
if (i == tx->u.tx.num_extra_frag) { if (i == tx->num_extra_frag) {
control->tx_rate = tx->u.tx.last_frag_rate; control->tx_rate = tx->last_frag_rate;
if (tx->flags & IEEE80211_TXRXD_TXPROBE_LAST_FRAG) if (tx->flags & IEEE80211_TX_PROBE_LAST_FRAG)
control->flags |= control->flags |=
IEEE80211_TXCTL_RATE_CTRL_PROBE; IEEE80211_TXCTL_RATE_CTRL_PROBE;
else else
...@@ -1108,18 +1108,18 @@ static int __ieee80211_tx(struct ieee80211_local *local, struct sk_buff *skb, ...@@ -1108,18 +1108,18 @@ static int __ieee80211_tx(struct ieee80211_local *local, struct sk_buff *skb,
ieee80211_dump_frame(wiphy_name(local->hw.wiphy), ieee80211_dump_frame(wiphy_name(local->hw.wiphy),
"TX to low-level driver", "TX to low-level driver",
tx->u.tx.extra_frag[i]); tx->extra_frag[i]);
ret = local->ops->tx(local_to_hw(local), ret = local->ops->tx(local_to_hw(local),
tx->u.tx.extra_frag[i], tx->extra_frag[i],
control); control);
if (ret) if (ret)
return IEEE80211_TX_FRAG_AGAIN; return IEEE80211_TX_FRAG_AGAIN;
local->mdev->trans_start = jiffies; local->mdev->trans_start = jiffies;
ieee80211_led_tx(local, 1); ieee80211_led_tx(local, 1);
tx->u.tx.extra_frag[i] = NULL; tx->extra_frag[i] = NULL;
} }
kfree(tx->u.tx.extra_frag); kfree(tx->extra_frag);
tx->u.tx.extra_frag = NULL; tx->extra_frag = NULL;
} }
return IEEE80211_TX_OK; return IEEE80211_TX_OK;
} }
...@@ -1130,7 +1130,7 @@ static int ieee80211_tx(struct net_device *dev, struct sk_buff *skb, ...@@ -1130,7 +1130,7 @@ static int ieee80211_tx(struct net_device *dev, struct sk_buff *skb,
struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
struct sta_info *sta; struct sta_info *sta;
ieee80211_tx_handler *handler; ieee80211_tx_handler *handler;
struct ieee80211_txrx_data tx; struct ieee80211_tx_data tx;
ieee80211_tx_result res = TX_DROP, res_prepare; ieee80211_tx_result res = TX_DROP, res_prepare;
int ret, i; int ret, i;
...@@ -1156,7 +1156,7 @@ static int ieee80211_tx(struct net_device *dev, struct sk_buff *skb, ...@@ -1156,7 +1156,7 @@ static int ieee80211_tx(struct net_device *dev, struct sk_buff *skb,
rcu_read_lock(); rcu_read_lock();
sta = tx.sta; sta = tx.sta;
tx.u.tx.channel = local->hw.conf.channel; tx.channel = local->hw.conf.channel;
for (handler = ieee80211_tx_handlers; *handler != NULL; for (handler = ieee80211_tx_handlers; *handler != NULL;
handler++) { handler++) {
...@@ -1181,18 +1181,18 @@ static int ieee80211_tx(struct net_device *dev, struct sk_buff *skb, ...@@ -1181,18 +1181,18 @@ static int ieee80211_tx(struct net_device *dev, struct sk_buff *skb,
return 0; return 0;
} }
if (tx.u.tx.extra_frag) { if (tx.extra_frag) {
for (i = 0; i < tx.u.tx.num_extra_frag; i++) { for (i = 0; i < tx.num_extra_frag; i++) {
int next_len, dur; int next_len, dur;
struct ieee80211_hdr *hdr = struct ieee80211_hdr *hdr =
(struct ieee80211_hdr *) (struct ieee80211_hdr *)
tx.u.tx.extra_frag[i]->data; tx.extra_frag[i]->data;
if (i + 1 < tx.u.tx.num_extra_frag) { if (i + 1 < tx.num_extra_frag) {
next_len = tx.u.tx.extra_frag[i + 1]->len; next_len = tx.extra_frag[i + 1]->len;
} else { } else {
next_len = 0; next_len = 0;
tx.u.tx.rate = tx.u.tx.last_frag_rate; tx.rate = tx.last_frag_rate;
} }
dur = ieee80211_duration(&tx, 0, next_len); dur = ieee80211_duration(&tx, 0, next_len);
hdr->duration_id = cpu_to_le16(dur); hdr->duration_id = cpu_to_le16(dur);
...@@ -1227,11 +1227,11 @@ static int ieee80211_tx(struct net_device *dev, struct sk_buff *skb, ...@@ -1227,11 +1227,11 @@ static int ieee80211_tx(struct net_device *dev, struct sk_buff *skb,
memcpy(&store->control, control, memcpy(&store->control, control,
sizeof(struct ieee80211_tx_control)); sizeof(struct ieee80211_tx_control));
store->skb = skb; store->skb = skb;
store->extra_frag = tx.u.tx.extra_frag; store->extra_frag = tx.extra_frag;
store->num_extra_frag = tx.u.tx.num_extra_frag; store->num_extra_frag = tx.num_extra_frag;
store->last_frag_rate = tx.u.tx.last_frag_rate; store->last_frag_rate = tx.last_frag_rate;
store->last_frag_rate_ctrl_probe = store->last_frag_rate_ctrl_probe =
!!(tx.flags & IEEE80211_TXRXD_TXPROBE_LAST_FRAG); !!(tx.flags & IEEE80211_TX_PROBE_LAST_FRAG);
} }
rcu_read_unlock(); rcu_read_unlock();
return 0; return 0;
...@@ -1239,10 +1239,10 @@ static int ieee80211_tx(struct net_device *dev, struct sk_buff *skb, ...@@ -1239,10 +1239,10 @@ static int ieee80211_tx(struct net_device *dev, struct sk_buff *skb,
drop: drop:
if (skb) if (skb)
dev_kfree_skb(skb); dev_kfree_skb(skb);
for (i = 0; i < tx.u.tx.num_extra_frag; i++) for (i = 0; i < tx.num_extra_frag; i++)
if (tx.u.tx.extra_frag[i]) if (tx.extra_frag[i])
dev_kfree_skb(tx.u.tx.extra_frag[i]); dev_kfree_skb(tx.extra_frag[i]);
kfree(tx.u.tx.extra_frag); kfree(tx.extra_frag);
rcu_read_unlock(); rcu_read_unlock();
return 0; return 0;
} }
...@@ -1670,7 +1670,7 @@ void ieee80211_tx_pending(unsigned long data) ...@@ -1670,7 +1670,7 @@ void ieee80211_tx_pending(unsigned long data)
struct ieee80211_local *local = (struct ieee80211_local *)data; struct ieee80211_local *local = (struct ieee80211_local *)data;
struct net_device *dev = local->mdev; struct net_device *dev = local->mdev;
struct ieee80211_tx_stored_packet *store; struct ieee80211_tx_stored_packet *store;
struct ieee80211_txrx_data tx; struct ieee80211_tx_data tx;
int i, ret, reschedule = 0; int i, ret, reschedule = 0;
netif_tx_lock_bh(dev); netif_tx_lock_bh(dev);
...@@ -1682,13 +1682,13 @@ void ieee80211_tx_pending(unsigned long data) ...@@ -1682,13 +1682,13 @@ void ieee80211_tx_pending(unsigned long data)
continue; continue;
} }
store = &local->pending_packet[i]; store = &local->pending_packet[i];
tx.u.tx.control = &store->control; tx.control = &store->control;
tx.u.tx.extra_frag = store->extra_frag; tx.extra_frag = store->extra_frag;
tx.u.tx.num_extra_frag = store->num_extra_frag; tx.num_extra_frag = store->num_extra_frag;
tx.u.tx.last_frag_rate = store->last_frag_rate; tx.last_frag_rate = store->last_frag_rate;
tx.flags = 0; tx.flags = 0;
if (store->last_frag_rate_ctrl_probe) if (store->last_frag_rate_ctrl_probe)
tx.flags |= IEEE80211_TXRXD_TXPROBE_LAST_FRAG; tx.flags |= IEEE80211_TX_PROBE_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)
...@@ -1943,7 +1943,7 @@ ieee80211_get_buffered_bc(struct ieee80211_hw *hw, ...@@ -1943,7 +1943,7 @@ ieee80211_get_buffered_bc(struct ieee80211_hw *hw,
struct sk_buff *skb; struct sk_buff *skb;
struct sta_info *sta; struct sta_info *sta;
ieee80211_tx_handler *handler; ieee80211_tx_handler *handler;
struct ieee80211_txrx_data tx; struct ieee80211_tx_data tx;
ieee80211_tx_result res = TX_DROP; ieee80211_tx_result res = TX_DROP;
struct net_device *bdev; struct net_device *bdev;
struct ieee80211_sub_if_data *sdata; struct ieee80211_sub_if_data *sdata;
...@@ -1991,8 +1991,8 @@ ieee80211_get_buffered_bc(struct ieee80211_hw *hw, ...@@ -1991,8 +1991,8 @@ ieee80211_get_buffered_bc(struct ieee80211_hw *hw,
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
} }
sta = tx.sta; sta = tx.sta;
tx.flags |= IEEE80211_TXRXD_TXPS_BUFFERED; tx.flags |= IEEE80211_TX_PS_BUFFERED;
tx.u.tx.channel = local->hw.conf.channel; tx.channel = local->hw.conf.channel;
for (handler = ieee80211_tx_handlers; *handler != NULL; handler++) { for (handler = ieee80211_tx_handlers; *handler != NULL; handler++) {
res = (*handler)(&tx); res = (*handler)(&tx);
......
net/mac80211/util.c
View file @ 5cf121c3
...@@ -165,17 +165,17 @@ int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr) ...@@ -165,17 +165,17 @@ int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr)
} }
} }
void ieee80211_tx_set_iswep(struct ieee80211_txrx_data *tx) void ieee80211_tx_set_protected(struct ieee80211_tx_data *tx)
{ {
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) tx->skb->data; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) tx->skb->data;
hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_PROTECTED); hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_PROTECTED);
if (tx->u.tx.extra_frag) { if (tx->extra_frag) {
struct ieee80211_hdr *fhdr; struct ieee80211_hdr *fhdr;
int i; int i;
for (i = 0; i < tx->u.tx.num_extra_frag; i++) { for (i = 0; i < tx->num_extra_frag; i++) {
fhdr = (struct ieee80211_hdr *) fhdr = (struct ieee80211_hdr *)
tx->u.tx.extra_frag[i]->data; tx->extra_frag[i]->data;
fhdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_PROTECTED); fhdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_PROTECTED);
} }
} }
......
net/mac80211/wep.c
View file @ 5cf121c3
...@@ -306,14 +306,14 @@ u8 * ieee80211_wep_is_weak_iv(struct sk_buff *skb, struct ieee80211_key *key) ...@@ -306,14 +306,14 @@ u8 * ieee80211_wep_is_weak_iv(struct sk_buff *skb, struct ieee80211_key *key)
} }
ieee80211_rx_result ieee80211_rx_result
ieee80211_crypto_wep_decrypt(struct ieee80211_txrx_data *rx) ieee80211_crypto_wep_decrypt(struct ieee80211_rx_data *rx)
{ {
if ((rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA && if ((rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA &&
((rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_MGMT || ((rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_MGMT ||
(rx->fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_AUTH)) (rx->fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_AUTH))
return RX_CONTINUE; return RX_CONTINUE;
if (!(rx->u.rx.status->flag & RX_FLAG_DECRYPTED)) { if (!(rx->status->flag & RX_FLAG_DECRYPTED)) {
if (ieee80211_wep_decrypt(rx->local, rx->skb, rx->key)) { if (ieee80211_wep_decrypt(rx->local, rx->skb, rx->key)) {
#ifdef CONFIG_MAC80211_DEBUG #ifdef CONFIG_MAC80211_DEBUG
if (net_ratelimit()) if (net_ratelimit())
...@@ -322,7 +322,7 @@ ieee80211_crypto_wep_decrypt(struct ieee80211_txrx_data *rx) ...@@ -322,7 +322,7 @@ ieee80211_crypto_wep_decrypt(struct ieee80211_txrx_data *rx)
#endif /* CONFIG_MAC80211_DEBUG */ #endif /* CONFIG_MAC80211_DEBUG */
return RX_DROP_UNUSABLE; return RX_DROP_UNUSABLE;
} }
} else if (!(rx->u.rx.status->flag & RX_FLAG_IV_STRIPPED)) { } else if (!(rx->status->flag & RX_FLAG_IV_STRIPPED)) {
ieee80211_wep_remove_iv(rx->local, rx->skb, rx->key); ieee80211_wep_remove_iv(rx->local, rx->skb, rx->key);
/* remove ICV */ /* remove ICV */
skb_trim(rx->skb, rx->skb->len - 4); skb_trim(rx->skb, rx->skb->len - 4);
...@@ -331,13 +331,13 @@ ieee80211_crypto_wep_decrypt(struct ieee80211_txrx_data *rx) ...@@ -331,13 +331,13 @@ ieee80211_crypto_wep_decrypt(struct ieee80211_txrx_data *rx)
return RX_CONTINUE; return RX_CONTINUE;
} }
static int wep_encrypt_skb(struct ieee80211_txrx_data *tx, struct sk_buff *skb) static int wep_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb)
{ {
if (!(tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE)) { if (!(tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE)) {
if (ieee80211_wep_encrypt(tx->local, skb, tx->key)) if (ieee80211_wep_encrypt(tx->local, skb, tx->key))
return -1; return -1;
} else { } else {
tx->u.tx.control->key_idx = tx->key->conf.hw_key_idx; tx->control->key_idx = tx->key->conf.hw_key_idx;
if (tx->key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_IV) { if (tx->key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_IV) {
if (!ieee80211_wep_add_iv(tx->local, skb, tx->key)) if (!ieee80211_wep_add_iv(tx->local, skb, tx->key))
return -1; return -1;
...@@ -347,21 +347,21 @@ static int wep_encrypt_skb(struct ieee80211_txrx_data *tx, struct sk_buff *skb) ...@@ -347,21 +347,21 @@ static int wep_encrypt_skb(struct ieee80211_txrx_data *tx, struct sk_buff *skb)
} }
ieee80211_tx_result ieee80211_tx_result
ieee80211_crypto_wep_encrypt(struct ieee80211_txrx_data *tx) ieee80211_crypto_wep_encrypt(struct ieee80211_tx_data *tx)
{ {
tx->u.tx.control->iv_len = WEP_IV_LEN; tx->control->iv_len = WEP_IV_LEN;
tx->u.tx.control->icv_len = WEP_ICV_LEN; tx->control->icv_len = WEP_ICV_LEN;
ieee80211_tx_set_iswep(tx); ieee80211_tx_set_protected(tx);
if (wep_encrypt_skb(tx, tx->skb) < 0) { if (wep_encrypt_skb(tx, tx->skb) < 0) {
I802_DEBUG_INC(tx->local->tx_handlers_drop_wep); I802_DEBUG_INC(tx->local->tx_handlers_drop_wep);
return TX_DROP; return TX_DROP;
} }
if (tx->u.tx.extra_frag) { if (tx->extra_frag) {
int i; int i;
for (i = 0; i < tx->u.tx.num_extra_frag; i++) { for (i = 0; i < tx->num_extra_frag; i++) {
if (wep_encrypt_skb(tx, tx->u.tx.extra_frag[i]) < 0) { if (wep_encrypt_skb(tx, tx->extra_frag[i]) < 0) {
I802_DEBUG_INC(tx->local-> I802_DEBUG_INC(tx->local->
tx_handlers_drop_wep); tx_handlers_drop_wep);
return TX_DROP; return TX_DROP;
......
net/mac80211/wep.h
View file @ 5cf121c3
...@@ -29,8 +29,8 @@ int ieee80211_wep_decrypt(struct ieee80211_local *local, struct sk_buff *skb, ...@@ -29,8 +29,8 @@ int ieee80211_wep_decrypt(struct ieee80211_local *local, struct sk_buff *skb,
u8 * ieee80211_wep_is_weak_iv(struct sk_buff *skb, struct ieee80211_key *key); u8 * ieee80211_wep_is_weak_iv(struct sk_buff *skb, struct ieee80211_key *key);
ieee80211_rx_result ieee80211_rx_result
ieee80211_crypto_wep_decrypt(struct ieee80211_txrx_data *rx); ieee80211_crypto_wep_decrypt(struct ieee80211_rx_data *rx);
ieee80211_tx_result ieee80211_tx_result
ieee80211_crypto_wep_encrypt(struct ieee80211_txrx_data *tx); ieee80211_crypto_wep_encrypt(struct ieee80211_tx_data *tx);
#endif /* WEP_H */ #endif /* WEP_H */
net/mac80211/wpa.c
View file @ 5cf121c3
...@@ -71,7 +71,7 @@ static int ieee80211_get_hdr_info(const struct sk_buff *skb, u8 **sa, u8 **da, ...@@ -71,7 +71,7 @@ static int ieee80211_get_hdr_info(const struct sk_buff *skb, u8 **sa, u8 **da,
ieee80211_tx_result ieee80211_tx_result
ieee80211_tx_h_michael_mic_add(struct ieee80211_txrx_data *tx) ieee80211_tx_h_michael_mic_add(struct ieee80211_tx_data *tx)
{ {
u8 *data, *sa, *da, *key, *mic, qos_tid; u8 *data, *sa, *da, *key, *mic, qos_tid;
size_t data_len; size_t data_len;
...@@ -90,7 +90,7 @@ ieee80211_tx_h_michael_mic_add(struct ieee80211_txrx_data *tx) ...@@ -90,7 +90,7 @@ ieee80211_tx_h_michael_mic_add(struct ieee80211_txrx_data *tx)
return TX_DROP; return TX_DROP;
if ((tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) && if ((tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) &&
!(tx->flags & IEEE80211_TXRXD_FRAGMENTED) && !(tx->flags & IEEE80211_TX_FRAGMENTED) &&
!(tx->key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_MMIC) && !(tx->key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_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
...@@ -124,7 +124,7 @@ ieee80211_tx_h_michael_mic_add(struct ieee80211_txrx_data *tx) ...@@ -124,7 +124,7 @@ ieee80211_tx_h_michael_mic_add(struct ieee80211_txrx_data *tx)
ieee80211_rx_result ieee80211_rx_result
ieee80211_rx_h_michael_mic_verify(struct ieee80211_txrx_data *rx) ieee80211_rx_h_michael_mic_verify(struct ieee80211_rx_data *rx)
{ {
u8 *data, *sa, *da, *key = NULL, qos_tid; u8 *data, *sa, *da, *key = NULL, qos_tid;
size_t data_len; size_t data_len;
...@@ -139,7 +139,7 @@ ieee80211_rx_h_michael_mic_verify(struct ieee80211_txrx_data *rx) ...@@ -139,7 +139,7 @@ ieee80211_rx_h_michael_mic_verify(struct ieee80211_txrx_data *rx)
/* /*
* No way to verify the MIC if the hardware stripped it * No way to verify the MIC if the hardware stripped it
*/ */
if (rx->u.rx.status->flag & RX_FLAG_MMIC_STRIPPED) if (rx->status->flag & RX_FLAG_MMIC_STRIPPED)
return RX_CONTINUE; return RX_CONTINUE;
if (!rx->key || rx->key->conf.alg != ALG_TKIP || if (!rx->key || rx->key->conf.alg != ALG_TKIP ||
...@@ -161,7 +161,7 @@ ieee80211_rx_h_michael_mic_verify(struct ieee80211_txrx_data *rx) ...@@ -161,7 +161,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->flags & IEEE80211_TXRXD_RXRA_MATCH)) if (!(rx->flags & IEEE80211_RX_RA_MATCH))
return RX_DROP_UNUSABLE; return RX_DROP_UNUSABLE;
printk(KERN_DEBUG "%s: invalid Michael MIC in data frame from " printk(KERN_DEBUG "%s: invalid Michael MIC in data frame from "
...@@ -176,14 +176,14 @@ ieee80211_rx_h_michael_mic_verify(struct ieee80211_txrx_data *rx) ...@@ -176,14 +176,14 @@ ieee80211_rx_h_michael_mic_verify(struct ieee80211_txrx_data *rx)
skb_trim(skb, skb->len - MICHAEL_MIC_LEN); skb_trim(skb, skb->len - MICHAEL_MIC_LEN);
/* update IV in key information to be able to detect replays */ /* update IV in key information to be able to detect replays */
rx->key->u.tkip.iv32_rx[rx->u.rx.queue] = rx->u.rx.tkip_iv32; rx->key->u.tkip.iv32_rx[rx->queue] = rx->tkip_iv32;
rx->key->u.tkip.iv16_rx[rx->u.rx.queue] = rx->u.rx.tkip_iv16; rx->key->u.tkip.iv16_rx[rx->queue] = rx->tkip_iv16;
return RX_CONTINUE; return RX_CONTINUE;
} }
static int tkip_encrypt_skb(struct ieee80211_txrx_data *tx, static int tkip_encrypt_skb(struct ieee80211_tx_data *tx,
struct sk_buff *skb, int test) struct sk_buff *skb, int test)
{ {
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
...@@ -228,7 +228,7 @@ static int tkip_encrypt_skb(struct ieee80211_txrx_data *tx, ...@@ -228,7 +228,7 @@ static int tkip_encrypt_skb(struct ieee80211_txrx_data *tx,
0x7f), 0x7f),
(u8) key->u.tkip.iv16); (u8) key->u.tkip.iv16);
tx->u.tx.control->key_idx = tx->key->conf.hw_key_idx; tx->control->key_idx = tx->key->conf.hw_key_idx;
return 0; return 0;
} }
...@@ -243,30 +243,30 @@ static int tkip_encrypt_skb(struct ieee80211_txrx_data *tx, ...@@ -243,30 +243,30 @@ static int tkip_encrypt_skb(struct ieee80211_txrx_data *tx,
ieee80211_tx_result ieee80211_tx_result
ieee80211_crypto_tkip_encrypt(struct ieee80211_txrx_data *tx) ieee80211_crypto_tkip_encrypt(struct ieee80211_tx_data *tx)
{ {
struct sk_buff *skb = tx->skb; struct sk_buff *skb = tx->skb;
int wpa_test = 0, test = 0; int wpa_test = 0, test = 0;
tx->u.tx.control->icv_len = TKIP_ICV_LEN; tx->control->icv_len = TKIP_ICV_LEN;
tx->u.tx.control->iv_len = TKIP_IV_LEN; tx->control->iv_len = TKIP_IV_LEN;
ieee80211_tx_set_iswep(tx); ieee80211_tx_set_protected(tx);
if ((tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) && if ((tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) &&
!(tx->key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_IV) && !(tx->key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_IV) &&
!wpa_test) { !wpa_test) {
/* hwaccel - with no need for preallocated room for IV/ICV */ /* hwaccel - with no need for preallocated room for IV/ICV */
tx->u.tx.control->key_idx = tx->key->conf.hw_key_idx; tx->control->key_idx = tx->key->conf.hw_key_idx;
return TX_CONTINUE; return TX_CONTINUE;
} }
if (tkip_encrypt_skb(tx, skb, test) < 0) if (tkip_encrypt_skb(tx, skb, test) < 0)
return TX_DROP; return TX_DROP;
if (tx->u.tx.extra_frag) { if (tx->extra_frag) {
int i; int i;
for (i = 0; i < tx->u.tx.num_extra_frag; i++) { for (i = 0; i < tx->num_extra_frag; i++) {
if (tkip_encrypt_skb(tx, tx->u.tx.extra_frag[i], test) if (tkip_encrypt_skb(tx, tx->extra_frag[i], test)
< 0) < 0)
return TX_DROP; return TX_DROP;
} }
...@@ -277,7 +277,7 @@ ieee80211_crypto_tkip_encrypt(struct ieee80211_txrx_data *tx) ...@@ -277,7 +277,7 @@ ieee80211_crypto_tkip_encrypt(struct ieee80211_txrx_data *tx)
ieee80211_rx_result ieee80211_rx_result
ieee80211_crypto_tkip_decrypt(struct ieee80211_txrx_data *rx) ieee80211_crypto_tkip_decrypt(struct ieee80211_rx_data *rx)
{ {
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) rx->skb->data; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) rx->skb->data;
u16 fc; u16 fc;
...@@ -295,8 +295,8 @@ ieee80211_crypto_tkip_decrypt(struct ieee80211_txrx_data *rx) ...@@ -295,8 +295,8 @@ ieee80211_crypto_tkip_decrypt(struct ieee80211_txrx_data *rx)
if (!rx->sta || skb->len - hdrlen < 12) if (!rx->sta || skb->len - hdrlen < 12)
return RX_DROP_UNUSABLE; return RX_DROP_UNUSABLE;
if (rx->u.rx.status->flag & RX_FLAG_DECRYPTED) { if (rx->status->flag & RX_FLAG_DECRYPTED) {
if (rx->u.rx.status->flag & RX_FLAG_IV_STRIPPED) { if (rx->status->flag & RX_FLAG_IV_STRIPPED) {
/* /*
* Hardware took care of all processing, including * Hardware took care of all processing, including
* replay protection, and stripped the ICV/IV so * replay protection, and stripped the ICV/IV so
...@@ -312,9 +312,9 @@ ieee80211_crypto_tkip_decrypt(struct ieee80211_txrx_data *rx) ...@@ -312,9 +312,9 @@ ieee80211_crypto_tkip_decrypt(struct ieee80211_txrx_data *rx)
res = ieee80211_tkip_decrypt_data(rx->local->wep_rx_tfm, res = ieee80211_tkip_decrypt_data(rx->local->wep_rx_tfm,
key, skb->data + hdrlen, key, skb->data + hdrlen,
skb->len - hdrlen, rx->sta->addr, skb->len - hdrlen, rx->sta->addr,
hwaccel, rx->u.rx.queue, hwaccel, rx->queue,
&rx->u.rx.tkip_iv32, &rx->tkip_iv32,
&rx->u.rx.tkip_iv16); &rx->tkip_iv16);
if (res != TKIP_DECRYPT_OK || wpa_test) { if (res != TKIP_DECRYPT_OK || wpa_test) {
#ifdef CONFIG_MAC80211_DEBUG #ifdef CONFIG_MAC80211_DEBUG
if (net_ratelimit()) if (net_ratelimit())
...@@ -429,7 +429,7 @@ static inline int ccmp_hdr2pn(u8 *pn, u8 *hdr) ...@@ -429,7 +429,7 @@ static inline int ccmp_hdr2pn(u8 *pn, u8 *hdr)
} }
static int ccmp_encrypt_skb(struct ieee80211_txrx_data *tx, static int ccmp_encrypt_skb(struct ieee80211_tx_data *tx,
struct sk_buff *skb, int test) struct sk_buff *skb, int test)
{ {
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
...@@ -478,7 +478,7 @@ static int ccmp_encrypt_skb(struct ieee80211_txrx_data *tx, ...@@ -478,7 +478,7 @@ static int ccmp_encrypt_skb(struct ieee80211_txrx_data *tx,
if (key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) { if (key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) {
/* hwaccel - with preallocated room for CCMP header */ /* hwaccel - with preallocated room for CCMP header */
tx->u.tx.control->key_idx = key->conf.hw_key_idx; tx->control->key_idx = key->conf.hw_key_idx;
return 0; return 0;
} }
...@@ -492,30 +492,30 @@ static int ccmp_encrypt_skb(struct ieee80211_txrx_data *tx, ...@@ -492,30 +492,30 @@ static int ccmp_encrypt_skb(struct ieee80211_txrx_data *tx,
ieee80211_tx_result ieee80211_tx_result
ieee80211_crypto_ccmp_encrypt(struct ieee80211_txrx_data *tx) ieee80211_crypto_ccmp_encrypt(struct ieee80211_tx_data *tx)
{ {
struct sk_buff *skb = tx->skb; struct sk_buff *skb = tx->skb;
int test = 0; int test = 0;
tx->u.tx.control->icv_len = CCMP_MIC_LEN; tx->control->icv_len = CCMP_MIC_LEN;
tx->u.tx.control->iv_len = CCMP_HDR_LEN; tx->control->iv_len = CCMP_HDR_LEN;
ieee80211_tx_set_iswep(tx); ieee80211_tx_set_protected(tx);
if ((tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) && if ((tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) &&
!(tx->key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_IV)) { !(tx->key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_IV)) {
/* hwaccel - with no need for preallocated room for CCMP " /* hwaccel - with no need for preallocated room for CCMP "
* header or MIC fields */ * header or MIC fields */
tx->u.tx.control->key_idx = tx->key->conf.hw_key_idx; tx->control->key_idx = tx->key->conf.hw_key_idx;
return TX_CONTINUE; return TX_CONTINUE;
} }
if (ccmp_encrypt_skb(tx, skb, test) < 0) if (ccmp_encrypt_skb(tx, skb, test) < 0)
return TX_DROP; return TX_DROP;
if (tx->u.tx.extra_frag) { if (tx->extra_frag) {
int i; int i;
for (i = 0; i < tx->u.tx.num_extra_frag; i++) { for (i = 0; i < tx->num_extra_frag; i++) {
if (ccmp_encrypt_skb(tx, tx->u.tx.extra_frag[i], test) if (ccmp_encrypt_skb(tx, tx->extra_frag[i], test)
< 0) < 0)
return TX_DROP; return TX_DROP;
} }
...@@ -526,7 +526,7 @@ ieee80211_crypto_ccmp_encrypt(struct ieee80211_txrx_data *tx) ...@@ -526,7 +526,7 @@ ieee80211_crypto_ccmp_encrypt(struct ieee80211_txrx_data *tx)
ieee80211_rx_result ieee80211_rx_result
ieee80211_crypto_ccmp_decrypt(struct ieee80211_txrx_data *rx) ieee80211_crypto_ccmp_decrypt(struct ieee80211_rx_data *rx)
{ {
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) rx->skb->data; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) rx->skb->data;
u16 fc; u16 fc;
...@@ -547,15 +547,15 @@ ieee80211_crypto_ccmp_decrypt(struct ieee80211_txrx_data *rx) ...@@ -547,15 +547,15 @@ ieee80211_crypto_ccmp_decrypt(struct ieee80211_txrx_data *rx)
if (!rx->sta || data_len < 0) if (!rx->sta || data_len < 0)
return RX_DROP_UNUSABLE; return RX_DROP_UNUSABLE;
if ((rx->u.rx.status->flag & RX_FLAG_DECRYPTED) && if ((rx->status->flag & RX_FLAG_DECRYPTED) &&
(rx->u.rx.status->flag & RX_FLAG_IV_STRIPPED)) (rx->status->flag & RX_FLAG_IV_STRIPPED))
return RX_CONTINUE; return RX_CONTINUE;
(void) ccmp_hdr2pn(pn, skb->data + hdrlen); (void) ccmp_hdr2pn(pn, skb->data + hdrlen);
if (memcmp(pn, key->u.ccmp.rx_pn[rx->u.rx.queue], CCMP_PN_LEN) <= 0) { if (memcmp(pn, key->u.ccmp.rx_pn[rx->queue], CCMP_PN_LEN) <= 0) {
#ifdef CONFIG_MAC80211_DEBUG #ifdef CONFIG_MAC80211_DEBUG
u8 *ppn = key->u.ccmp.rx_pn[rx->u.rx.queue]; u8 *ppn = key->u.ccmp.rx_pn[rx->queue];
printk(KERN_DEBUG "%s: CCMP replay detected for RX frame from " printk(KERN_DEBUG "%s: CCMP replay detected for RX frame from "
"%s (RX PN %02x%02x%02x%02x%02x%02x <= prev. PN " "%s (RX PN %02x%02x%02x%02x%02x%02x <= prev. PN "
...@@ -568,7 +568,7 @@ ieee80211_crypto_ccmp_decrypt(struct ieee80211_txrx_data *rx) ...@@ -568,7 +568,7 @@ ieee80211_crypto_ccmp_decrypt(struct ieee80211_txrx_data *rx)
return RX_DROP_UNUSABLE; return RX_DROP_UNUSABLE;
} }
if (!(rx->u.rx.status->flag & RX_FLAG_DECRYPTED)) { if (!(rx->status->flag & RX_FLAG_DECRYPTED)) {
/* hardware didn't decrypt/verify MIC */ /* hardware didn't decrypt/verify MIC */
u8 *scratch, *b_0, *aad; u8 *scratch, *b_0, *aad;
...@@ -593,7 +593,7 @@ ieee80211_crypto_ccmp_decrypt(struct ieee80211_txrx_data *rx) ...@@ -593,7 +593,7 @@ ieee80211_crypto_ccmp_decrypt(struct ieee80211_txrx_data *rx)
} }
} }
memcpy(key->u.ccmp.rx_pn[rx->u.rx.queue], pn, CCMP_PN_LEN); memcpy(key->u.ccmp.rx_pn[rx->queue], pn, CCMP_PN_LEN);
/* Remove CCMP header and MIC */ /* Remove CCMP header and MIC */
skb_trim(skb, skb->len - CCMP_MIC_LEN); skb_trim(skb, skb->len - CCMP_MIC_LEN);
......
net/mac80211/wpa.h
View file @ 5cf121c3
...@@ -14,18 +14,18 @@ ...@@ -14,18 +14,18 @@
#include "ieee80211_i.h" #include "ieee80211_i.h"
ieee80211_tx_result ieee80211_tx_result
ieee80211_tx_h_michael_mic_add(struct ieee80211_txrx_data *tx); ieee80211_tx_h_michael_mic_add(struct ieee80211_tx_data *tx);
ieee80211_rx_result ieee80211_rx_result
ieee80211_rx_h_michael_mic_verify(struct ieee80211_txrx_data *rx); ieee80211_rx_h_michael_mic_verify(struct ieee80211_rx_data *rx);
ieee80211_tx_result ieee80211_tx_result
ieee80211_crypto_tkip_encrypt(struct ieee80211_txrx_data *tx); ieee80211_crypto_tkip_encrypt(struct ieee80211_tx_data *tx);
ieee80211_rx_result ieee80211_rx_result
ieee80211_crypto_tkip_decrypt(struct ieee80211_txrx_data *rx); ieee80211_crypto_tkip_decrypt(struct ieee80211_rx_data *rx);
ieee80211_tx_result ieee80211_tx_result
ieee80211_crypto_ccmp_encrypt(struct ieee80211_txrx_data *tx); ieee80211_crypto_ccmp_encrypt(struct ieee80211_tx_data *tx);
ieee80211_rx_result ieee80211_rx_result
ieee80211_crypto_ccmp_decrypt(struct ieee80211_txrx_data *rx); ieee80211_crypto_ccmp_decrypt(struct ieee80211_rx_data *rx);
#endif /* WPA_H */ #endif /* WPA_H */
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