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

Commit 18ca4382 authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by John W. Linville
Browse files

mwifiex: add Tx status support for ACTION frames 



ACK status (0/1) for ACTION frames is informed to cfg80211. We
will extend existing logic used for EAPOL frames. The cfg80211
API is different here. Also, we need to explicitly free cloned
skb.

Signed-off-by: default avatarCathy Luo <cluo@marvell.com>
Signed-off-by: default avatarAvinash Patil <patila@marvell.com>
Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 808bbebc

drivers/net/wireless/mwifiex/cfg80211.c

+10 −3
Original line number Diff line number Diff line
@@ -194,10 +194,17 @@ mwifiex_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, 
	tx_info->pkt_len = pkt_len;



	mwifiex_form_mgmt_frame(skb, buf, len);

	mwifiex_queue_tx_pkt(priv, skb);



	*cookie = prandom_u32() | 1;

	cfg80211_mgmt_tx_status(wdev, *cookie, buf, len, true, GFP_ATOMIC);



	if (ieee80211_is_action(mgmt->frame_control))

		skb = mwifiex_clone_skb_for_tx_status(priv,

						      skb,

				MWIFIEX_BUF_FLAG_ACTION_TX_STATUS, cookie);

	else

		cfg80211_mgmt_tx_status(wdev, *cookie, buf, len, true,

					GFP_ATOMIC);



	mwifiex_queue_tx_pkt(priv, skb);



	wiphy_dbg(wiphy, "info: management frame transmitted\n");

	return 0;

drivers/net/wireless/mwifiex/decl.h

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ 
#define MWIFIEX_BUF_FLAG_BRIDGED_PKT	   BIT(1)

#define MWIFIEX_BUF_FLAG_TDLS_PKT	   BIT(2)

#define MWIFIEX_BUF_FLAG_EAPOL_TX_STATUS   BIT(3)

#define MWIFIEX_BUF_FLAG_ACTION_TX_STATUS  BIT(4)



#define MWIFIEX_BRIDGED_PKTS_THR_HIGH      1024

#define MWIFIEX_BRIDGED_PKTS_THR_LOW        128
@@ -161,6 +162,7 @@ struct mwifiex_txinfo { 
	u8 bss_type;

	u32 pkt_len;

	u8 ack_frame_id;

	u64 cookie;

};



enum mwifiex_wmm_ac_e {

drivers/net/wireless/mwifiex/main.c

+7 −3
Original line number Diff line number Diff line
@@ -608,9 +608,9 @@ int mwifiex_queue_tx_pkt(struct mwifiex_private *priv, struct sk_buff *skb) 
	return 0;

}



static struct sk_buff *

struct sk_buff *

mwifiex_clone_skb_for_tx_status(struct mwifiex_private *priv,

				struct sk_buff *skb, u8 flag)

				struct sk_buff *skb, u8 flag, u64 *cookie)

{

	struct sk_buff *orig_skb = skb;

	struct mwifiex_txinfo *tx_info, *orig_tx_info;
@@ -632,6 +632,10 @@ mwifiex_clone_skb_for_tx_status(struct mwifiex_private *priv, 
			orig_tx_info = MWIFIEX_SKB_TXCB(orig_skb);

			orig_tx_info->ack_frame_id = id;

			orig_tx_info->flags |= flag;



			if (flag == MWIFIEX_BUF_FLAG_ACTION_TX_STATUS && cookie)

				orig_tx_info->cookie = *cookie;



		} else if (skb_shared(skb)) {

			kfree_skb(orig_skb);

		} else {
@@ -703,7 +707,7 @@ mwifiex_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) 
		     priv->adapter->fw_api_ver == MWIFIEX_FW_V15))

		skb = mwifiex_clone_skb_for_tx_status(priv,

						      skb,

					MWIFIEX_BUF_FLAG_EAPOL_TX_STATUS);

					MWIFIEX_BUF_FLAG_EAPOL_TX_STATUS, NULL);



	/* Record the current time the packet was queued; used to

	 * determine the amount of time the packet was queued in

drivers/net/wireless/mwifiex/main.h

+4 −0
Original line number Diff line number Diff line
@@ -1342,6 +1342,10 @@ void mwifiex_clean_auto_tdls(struct mwifiex_private *priv); 
void mwifiex_parse_tx_status_event(struct mwifiex_private *priv,

				   void *event_body);



struct sk_buff *

mwifiex_clone_skb_for_tx_status(struct mwifiex_private *priv,

				struct sk_buff *skb, u8 flag, u64 *cookie);



#ifdef CONFIG_DEBUG_FS

void mwifiex_debugfs_init(void);

void mwifiex_debugfs_remove(void);

drivers/net/wireless/mwifiex/sta_tx.c

+2 −1
Original line number Diff line number Diff line
@@ -77,7 +77,8 @@ void *mwifiex_process_sta_txpd(struct mwifiex_private *priv, 
	local_tx_pd->pkt_delay_2ms =

				mwifiex_wmm_compute_drv_pkt_delay(priv, skb);



	if (tx_info->flags & MWIFIEX_BUF_FLAG_EAPOL_TX_STATUS) {

	if (tx_info->flags & MWIFIEX_BUF_FLAG_EAPOL_TX_STATUS ||

	    tx_info->flags & MWIFIEX_BUF_FLAG_ACTION_TX_STATUS) {

		local_tx_pd->tx_token_id = tx_info->ack_frame_id;

		local_tx_pd->flags |= MWIFIEX_TXPD_FLAGS_REQ_TX_STATUS;

	}