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

Commit 40dc9e4b authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k_htc: Use SKB's private area for TX parameters 



For all packets sent through the USB_WLAN_TX_PIPE endpoint,
the private area of the SKB's tx_info can be used to store
driver-specific information. For packets sent through USB_REG_OUT_PIPE,
this will not make a difference since they are routed through a
separate routine that doesn't access the private region.

This would help in situations where TX information is required
in the URB callback.

Signed-off-by: default avatarSujith Manoharan <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e723f390

drivers/net/wireless/ath/ath9k/hif_usb.c

+9 −8
Original line number Diff line number Diff line
@@ -284,9 +284,9 @@ static int __hif_usb_tx(struct hif_device_usb *hif_dev) 
	return ret;

}



static int hif_usb_send_tx(struct hif_device_usb *hif_dev, struct sk_buff *skb,

			   struct ath9k_htc_tx_ctl *tx_ctl)

static int hif_usb_send_tx(struct hif_device_usb *hif_dev, struct sk_buff *skb)

{

	struct ath9k_htc_tx_ctl *tx_ctl;

	unsigned long flags;



	spin_lock_irqsave(&hif_dev->tx.tx_lock, flags);
@@ -305,12 +305,14 @@ static int hif_usb_send_tx(struct hif_device_usb *hif_dev, struct sk_buff *skb, 
	__skb_queue_tail(&hif_dev->tx.tx_skb_queue, skb);

	hif_dev->tx.tx_skb_cnt++;



	/* Send normal frames immediately */

	if (!tx_ctl || (tx_ctl && (tx_ctl->type == ATH9K_HTC_NORMAL)))

	tx_ctl = HTC_SKB_CB(skb);



	/* Send normal/mgmt/beacon frames immediately */

	if (tx_ctl->type != ATH9K_HTC_AMPDU)

		__hif_usb_tx(hif_dev);



	/* Check if AMPDUs have to be sent immediately */

	if (tx_ctl && (tx_ctl->type == ATH9K_HTC_AMPDU) &&

	if ((tx_ctl->type == ATH9K_HTC_AMPDU) &&

	    (hif_dev->tx.tx_buf_cnt == MAX_TX_URB_NUM) &&

	    (hif_dev->tx.tx_skb_cnt < 2)) {

		__hif_usb_tx(hif_dev);
@@ -352,15 +354,14 @@ static void hif_usb_stop(void *hif_handle, u8 pipe_id) 
	}

}



static int hif_usb_send(void *hif_handle, u8 pipe_id, struct sk_buff *skb,

			struct ath9k_htc_tx_ctl *tx_ctl)

static int hif_usb_send(void *hif_handle, u8 pipe_id, struct sk_buff *skb)

{

	struct hif_device_usb *hif_dev = (struct hif_device_usb *)hif_handle;

	int ret = 0;



	switch (pipe_id) {

	case USB_WLAN_TX_PIPE:

		ret = hif_usb_send_tx(hif_dev, skb, tx_ctl);

		ret = hif_usb_send_tx(hif_dev, skb);

		break;

	case USB_REG_OUT_PIPE:

		ret = hif_usb_send_regout(hif_dev, skb);

drivers/net/wireless/ath/ath9k/htc.h

+13 −1
Original line number Diff line number Diff line
@@ -67,8 +67,11 @@ enum htc_opmode { 
};



#define ATH9K_HTC_HDRSPACE sizeof(struct htc_frame_hdr)



#define ATH9K_HTC_AMPDU  1

#define ATH9K_HTC_NORMAL 2

#define ATH9K_HTC_BEACON 3

#define ATH9K_HTC_MGMT   4



#define ATH9K_HTC_TX_CTSONLY      0x1

#define ATH9K_HTC_TX_RTSCTS       0x2
@@ -288,6 +291,15 @@ struct ath9k_htc_tx_ctl { 
	u8 type; /* ATH9K_HTC_* */

};



static inline struct ath9k_htc_tx_ctl *HTC_SKB_CB(struct sk_buff *skb)

{

	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);



	BUILD_BUG_ON(sizeof(struct ath9k_htc_tx_ctl) >

		     IEEE80211_TX_INFO_DRIVER_DATA_SIZE);

	return (struct ath9k_htc_tx_ctl *) &tx_info->driver_data;

}



#ifdef CONFIG_ATH9K_HTC_DEBUGFS



#define TX_STAT_INC(c) (hif_dev->htc_handle->drv_priv->debug.tx_stats.c++)

drivers/net/wireless/ath/ath9k/htc_drv_beacon.c

+7 −4
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ static void ath9k_htc_send_beacon(struct ath9k_htc_priv *priv, 
	struct ieee80211_vif *vif;

	struct ath9k_htc_vif *avp;

	struct tx_beacon_header beacon_hdr;

	struct ath9k_htc_tx_ctl tx_ctl;

	struct ath9k_htc_tx_ctl *tx_ctl;

	struct ieee80211_tx_info *info;

	struct ieee80211_mgmt *mgmt;

	struct sk_buff *beacon;
@@ -349,7 +349,6 @@ static void ath9k_htc_send_beacon(struct ath9k_htc_priv *priv, 
	int ret;



	memset(&beacon_hdr, 0, sizeof(struct tx_beacon_header));

	memset(&tx_ctl, 0, sizeof(struct ath9k_htc_tx_ctl));



	spin_lock_bh(&priv->beacon_lock);
@@ -384,12 +383,16 @@ static void ath9k_htc_send_beacon(struct ath9k_htc_priv *priv, 
		hdr->seq_ctrl |= cpu_to_le16(avp->seq_no);

	}



	tx_ctl.type = ATH9K_HTC_NORMAL;

	tx_ctl = HTC_SKB_CB(beacon);

	memset(tx_ctl, 0, sizeof(*tx_ctl));



	tx_ctl->type = ATH9K_HTC_BEACON;



	beacon_hdr.vif_index = avp->index;

	tx_fhdr = skb_push(beacon, sizeof(beacon_hdr));

	memcpy(tx_fhdr, (u8 *) &beacon_hdr, sizeof(beacon_hdr));



	ret = htc_send(priv->htc, beacon, priv->beacon_ep, &tx_ctl);

	ret = htc_send(priv->htc, beacon, priv->beacon_ep);

	if (ret != 0) {

		if (ret == -ENOMEM) {

			ath_dbg(common, ATH_DBG_BSTUCK,

drivers/net/wireless/ath/ath9k/htc_drv_txrx.c

+8 −7
Original line number Diff line number Diff line
@@ -89,13 +89,16 @@ int ath9k_htc_tx_start(struct ath9k_htc_priv *priv, 
	struct ieee80211_vif *vif = tx_info->control.vif;

	struct ath9k_htc_sta *ista;

	struct ath9k_htc_vif *avp = NULL;

	struct ath9k_htc_tx_ctl tx_ctl;

	struct ath9k_htc_tx_ctl *tx_ctl;

	enum htc_endpoint_id epid;

	u16 qnum;

	__le16 fc;

	u8 *tx_fhdr;

	u8 sta_idx, vif_idx;



	tx_ctl = HTC_SKB_CB(skb);

	memset(tx_ctl, 0, sizeof(*tx_ctl));



	hdr = (struct ieee80211_hdr *) skb->data;

	fc = hdr->frame_control;
@@ -126,8 +129,6 @@ int ath9k_htc_tx_start(struct ath9k_htc_priv *priv, 
		sta_idx = priv->vif_sta_pos[vif_idx];

	}



	memset(&tx_ctl, 0, sizeof(struct ath9k_htc_tx_ctl));



	if (ieee80211_is_data(fc)) {

		struct tx_frame_hdr tx_hdr;

		u32 flags = 0;
@@ -139,10 +140,10 @@ int ath9k_htc_tx_start(struct ath9k_htc_priv *priv, 
		tx_hdr.vif_idx = vif_idx;



		if (tx_info->flags & IEEE80211_TX_CTL_AMPDU) {

			tx_ctl.type = ATH9K_HTC_AMPDU;

			tx_ctl->type = ATH9K_HTC_AMPDU;

			tx_hdr.data_type = ATH9K_HTC_AMPDU;

		} else {

			tx_ctl.type = ATH9K_HTC_NORMAL;

			tx_ctl->type = ATH9K_HTC_NORMAL;

			tx_hdr.data_type = ATH9K_HTC_NORMAL;

		}
@@ -212,7 +213,7 @@ int ath9k_htc_tx_start(struct ath9k_htc_priv *priv, 
			mgmt->u.probe_resp.timestamp = avp->tsfadjust;

		}



		tx_ctl.type = ATH9K_HTC_NORMAL;

		tx_ctl->type = ATH9K_HTC_MGMT;



		mgmt_hdr.node_idx = sta_idx;

		mgmt_hdr.vif_idx = vif_idx;
@@ -230,7 +231,7 @@ int ath9k_htc_tx_start(struct ath9k_htc_priv *priv, 
		epid = priv->mgmt_ep;

	}

send:

	return htc_send(priv->htc, skb, epid, &tx_ctl);

	return htc_send(priv->htc, skb, epid);

}



static bool ath9k_htc_check_tx_aggr(struct ath9k_htc_priv *priv,

drivers/net/wireless/ath/ath9k/htc_hst.c

+9 −9
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
#include "htc.h"



static int htc_issue_send(struct htc_target *target, struct sk_buff* skb,

			  u16 len, u8 flags, u8 epid,

			  struct ath9k_htc_tx_ctl *tx_ctl)

			  u16 len, u8 flags, u8 epid)



{

	struct htc_frame_hdr *hdr;

	struct htc_endpoint *endpoint = &target->endpoint[epid];
@@ -30,8 +30,8 @@ static int htc_issue_send(struct htc_target *target, struct sk_buff* skb, 
	hdr->flags = flags;

	hdr->payload_len = cpu_to_be16(len);



	status = target->hif->send(target->hif_dev, endpoint->ul_pipeid, skb,

				   tx_ctl);

	status = target->hif->send(target->hif_dev, endpoint->ul_pipeid, skb);



	return status;

}
@@ -162,7 +162,7 @@ static int htc_config_pipe_credits(struct htc_target *target) 


	target->htc_flags |= HTC_OP_CONFIG_PIPE_CREDITS;



	ret = htc_issue_send(target, skb, skb->len, 0, ENDPOINT0, NULL);

	ret = htc_issue_send(target, skb, skb->len, 0, ENDPOINT0);

	if (ret)

		goto err;
@@ -197,7 +197,7 @@ static int htc_setup_complete(struct htc_target *target) 


	target->htc_flags |= HTC_OP_START_WAIT;



	ret = htc_issue_send(target, skb, skb->len, 0, ENDPOINT0, NULL);

	ret = htc_issue_send(target, skb, skb->len, 0, ENDPOINT0);

	if (ret)

		goto err;
@@ -268,7 +268,7 @@ int htc_connect_service(struct htc_target *target, 
	conn_msg->dl_pipeid = endpoint->dl_pipeid;

	conn_msg->ul_pipeid = endpoint->ul_pipeid;



	ret = htc_issue_send(target, skb, skb->len, 0, ENDPOINT0, NULL);

	ret = htc_issue_send(target, skb, skb->len, 0, ENDPOINT0);

	if (ret)

		goto err;
@@ -287,9 +287,9 @@ int htc_connect_service(struct htc_target *target, 
}



int htc_send(struct htc_target *target, struct sk_buff *skb,

	     enum htc_endpoint_id epid, struct ath9k_htc_tx_ctl *tx_ctl)

	     enum htc_endpoint_id epid)

{

	return htc_issue_send(target, skb, skb->len, 0, epid, tx_ctl);

	return htc_issue_send(target, skb, skb->len, 0, epid);

}



void htc_stop(struct htc_target *target)