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

Commit 3ea96463 authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Fix TX short preamble detection 



The short preamble mode was not correctly detected during TX,
rt2x00 used the rate->hw_value_short field but mac80211 is not
using this field that way.
Instead the flag IEEE80211_TX_RC_USE_SHORT_PREAMBLE should be
used to determine if the frame should be send out using
short preamble or not.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3be36ae2

drivers/net/wireless/rt2x00/rt2x00dev.c

+3 −5
Original line number Diff line number Diff line
@@ -807,13 +807,11 @@ static void rt2x00lib_rate(struct ieee80211_rate *entry, 
{

	entry->flags = 0;

	entry->bitrate = rate->bitrate;

	entry->hw_value = rt2x00_create_rate_hw_value(index, 0);

	entry->hw_value_short = entry->hw_value;

	entry->hw_value =index;

	entry->hw_value_short = index;



	if (rate->flags & DEV_RATE_SHORT_PREAMBLE) {

	if (rate->flags & DEV_RATE_SHORT_PREAMBLE)

		entry->flags |= IEEE80211_RATE_SHORT_PREAMBLE;

		entry->hw_value_short |= rt2x00_create_rate_hw_value(index, 1);

	}

}



static int rt2x00lib_probe_hw_modes(struct rt2x00_dev *rt2x00dev,

drivers/net/wireless/rt2x00/rt2x00lib.h

+0 −11
Original line number Diff line number Diff line
@@ -52,22 +52,11 @@ struct rt2x00_rate { 


extern const struct rt2x00_rate rt2x00_supported_rates[12];



static inline u16 rt2x00_create_rate_hw_value(const u16 index,

					      const u16 short_preamble)

{

	return (short_preamble << 8) | (index & 0xff);

}



static inline const struct rt2x00_rate *rt2x00_get_rate(const u16 hw_value)

{

	return &rt2x00_supported_rates[hw_value & 0xff];

}



static inline int rt2x00_get_rate_preamble(const u16 hw_value)

{

	return (hw_value & 0xff00);

}



/*

 * Radio control handlers.

 */

drivers/net/wireless/rt2x00/rt2x00queue.c

+1 −1
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ static void rt2x00queue_create_tx_descriptor(struct queue_entry *entry, 
		 * When preamble is enabled we should set the

		 * preamble bit for the signal.

		 */

		if (rt2x00_get_rate_preamble(rate->hw_value))

		if (rate->flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE)

			txdesc->signal |= 0x08;

	}

}