Commit be7078c2 authored by Juuso Oikarinen's avatar Juuso Oikarinen Committed by John W. Linville
Browse files

wl1271: Corrections to TX path 



Corrections to the TX path - use correct number of maximum descriptors
(32 instead of 16) and correct checking and setting of excessive retries
on completion.

Signed-off-by: default avatarJuuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d94cd297

drivers/net/wireless/wl12xx/wl1271.h

+3 −1
Original line number Diff line number Diff line
@@ -123,6 +123,8 @@ enum { 
#define WL1271_DEFAULT_BEACON_INT  100

#define WL1271_DEFAULT_DTIM_PERIOD 1



#define ACX_TX_DESCRIPTORS    32



enum wl1271_state {

	WL1271_STATE_OFF,

	WL1271_STATE_ON,
@@ -346,7 +348,7 @@ struct wl1271 { 
	struct work_struct filter_work;



	/* Pending TX frames */

	struct sk_buff *tx_frames[16];

	struct sk_buff *tx_frames[ACX_TX_DESCRIPTORS];



	/* Security sequence number counters */

	u8 tx_security_last_seq;

drivers/net/wireless/wl12xx/wl1271_acx.h

+0 −1
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ enum { 
#define  DP_RX_PACKET_RING_CHUNK_NUM 2

#define  DP_TX_PACKET_RING_CHUNK_NUM 2

#define  DP_TX_COMPLETE_TIME_OUT 20

#define  FW_TX_CMPLT_BLOCK_SIZE 16



#define TX_MSDU_LIFETIME_MIN       0

#define TX_MSDU_LIFETIME_MAX       3000

drivers/net/wireless/wl12xx/wl1271_main.c

+1 −3
Original line number Diff line number Diff line
@@ -1293,9 +1293,7 @@ static int __devinit wl1271_probe(struct spi_device *spi) 
	wl->basic_rate_set = WL1271_DEFAULT_BASIC_RATE_SET;

	wl->band = IEEE80211_BAND_2GHZ;



	/* We use the default power on sleep time until we know which chip

	 * we're using */

	for (i = 0; i < FW_TX_CMPLT_BLOCK_SIZE; i++)

	for (i = 0; i < ACX_TX_DESCRIPTORS; i++)

		wl->tx_frames[i] = NULL;



	spin_lock_init(&wl->wl_lock);

drivers/net/wireless/wl12xx/wl1271_tx.c

+3 −5
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ 
static int wl1271_tx_id(struct wl1271 *wl, struct sk_buff *skb)

{

	int i;



	for (i = 0; i < FW_TX_CMPLT_BLOCK_SIZE; i++)

	for (i = 0; i < ACX_TX_DESCRIPTORS; i++)

		if (wl->tx_frames[i] == NULL) {

			wl->tx_frames[i] = skb;

			return i;
@@ -262,14 +261,13 @@ void wl1271_tx_work(struct work_struct *work) 
static void wl1271_tx_complete_packet(struct wl1271 *wl,

				      struct wl1271_tx_hw_res_descr *result)

{



	struct ieee80211_tx_info *info;

	struct sk_buff *skb;

	u16 seq;

	int id = result->id;



	/* check for id legality */

	if (id >= TX_HW_RESULT_QUEUE_LEN || wl->tx_frames[id] == NULL) {

	if (id >= ACX_TX_DESCRIPTORS || wl->tx_frames[id] == NULL) {

		wl1271_warning("TX result illegal id: %d", id);

		return;

	}
@@ -382,7 +380,7 @@ void wl1271_tx_flush(struct wl1271 *wl) 
		ieee80211_tx_status(wl->hw, skb);

	}



	for (i = 0; i < FW_TX_CMPLT_BLOCK_SIZE; i++)

	for (i = 0; i < ACX_TX_DESCRIPTORS; i++)

		if (wl->tx_frames[i] != NULL) {

			skb = wl->tx_frames[i];

			info = IEEE80211_SKB_CB(skb);