Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

net/mac80211/ieee80211_i.h

+47 −39
Original line number Diff line number Diff line
@@ -142,26 +142,13 @@ typedef unsigned __bitwise__ ieee80211_tx_result; 
#define TX_DROP		((__force ieee80211_tx_result) 1u)

#define TX_QUEUED	((__force ieee80211_tx_result) 2u)



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_TX_FRAGMENTED		BIT(0)

#define IEEE80211_TX_UNICAST		BIT(1)

#define IEEE80211_TX_PS_BUFFERED	BIT(2)

#define IEEE80211_TX_PROBE_LAST_FRAG	BIT(3)

#define IEEE80211_TX_INJECTED		BIT(4)



/* flags used in struct ieee80211_txrx_data.flags */

/* whether the MSDU was fragmented */

#define IEEE80211_TXRXD_FRAGMENTED		BIT(0)

#define IEEE80211_TXRXD_TXUNICAST		BIT(1)

#define IEEE80211_TXRXD_TXPS_BUFFERED		BIT(2)

#define IEEE80211_TXRXD_TXPROBE_LAST_FRAG	BIT(3)

#define IEEE80211_TXRXD_RXIN_SCAN		BIT(4)

/* frame is destined to interface currently processed (incl. multicast frames) */

#define IEEE80211_TXRXD_RXRA_MATCH		BIT(5)

#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 ieee80211_tx_data {

	struct sk_buff *skb;

	struct net_device *dev;

	struct ieee80211_local *local;
@@ -170,8 +157,7 @@ struct ieee80211_txrx_data { 
	u16 fc, ethertype;

	struct ieee80211_key *key;

	unsigned int flags;

	union {

		struct {



	struct ieee80211_tx_control *control;

	struct ieee80211_channel *channel;

	struct ieee80211_rate *rate;
@@ -184,8 +170,32 @@ struct ieee80211_txrx_data { 
	 * in skb) */

	int num_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_rate *rate;

	int sent_ps_buffered;
@@ -193,8 +203,6 @@ struct ieee80211_txrx_data { 
	int load;

	u32 tkip_iv32;

	u16 tkip_iv16;

		} rx;

	} u;

};



/* 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) 
int ieee80211_hw_config(struct ieee80211_local *local);

int ieee80211_if_config(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);

void ieee80211_if_setup(struct net_device *dev);

int ieee80211_hw_config_ht(struct ieee80211_local *local, int enable_ht,

net/mac80211/rx.c

+82 −81

File changed.

Preview size limit exceeded, changes collapsed.

net/mac80211/tx.c

+122 −122

File changed.

Preview size limit exceeded, changes collapsed.

net/mac80211/util.c

+4 −4
Original line number Diff line number Diff line
@@ -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;



	hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_PROTECTED);

	if (tx->u.tx.extra_frag) {

	if (tx->extra_frag) {

		struct ieee80211_hdr *fhdr;

		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 *)

				tx->u.tx.extra_frag[i]->data;

				tx->extra_frag[i]->data;

			fhdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_PROTECTED);

		}

	}

net/mac80211/wep.c

+12 −12
Original line number Diff line number Diff line
@@ -306,14 +306,14 @@ u8 * ieee80211_wep_is_weak_iv(struct sk_buff *skb, struct ieee80211_key *key) 
}



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 &&

	    ((rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_MGMT ||

	     (rx->fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_AUTH))

		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)) {

#ifdef CONFIG_MAC80211_DEBUG

			if (net_ratelimit())
@@ -322,7 +322,7 @@ ieee80211_crypto_wep_decrypt(struct ieee80211_txrx_data *rx) 
#endif /* CONFIG_MAC80211_DEBUG */

			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);

		/* remove ICV */

		skb_trim(rx->skb, rx->skb->len - 4);
@@ -331,13 +331,13 @@ ieee80211_crypto_wep_decrypt(struct ieee80211_txrx_data *rx) 
	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 (ieee80211_wep_encrypt(tx->local, skb, tx->key))

			return -1;

	} 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 (!ieee80211_wep_add_iv(tx->local, skb, tx->key))

				return -1;
@@ -347,21 +347,21 @@ static int wep_encrypt_skb(struct ieee80211_txrx_data *tx, struct sk_buff *skb) 
}



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->u.tx.control->icv_len = WEP_ICV_LEN;

	ieee80211_tx_set_iswep(tx);

	tx->control->iv_len = WEP_IV_LEN;

	tx->control->icv_len = WEP_ICV_LEN;

	ieee80211_tx_set_protected(tx);



	if (wep_encrypt_skb(tx, tx->skb) < 0) {

		I802_DEBUG_INC(tx->local->tx_handlers_drop_wep);

		return TX_DROP;

	}



	if (tx->u.tx.extra_frag) {

	if (tx->extra_frag) {

		int i;

		for (i = 0; i < tx->u.tx.num_extra_frag; i++) {

			if (wep_encrypt_skb(tx, tx->u.tx.extra_frag[i]) < 0) {

		for (i = 0; i < tx->num_extra_frag; i++) {

			if (wep_encrypt_skb(tx, tx->extra_frag[i]) < 0) {

				I802_DEBUG_INC(tx->local->

					       tx_handlers_drop_wep);

				return TX_DROP;