Commit 46a01ec0 authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by John W. Linville
Browse files

rt2x00: Merge rt2x00ht.c contents in other files. 



The two functions that are in rt2x00ht.c can be much better placed
closer to the places where the call-sites of these functions are (one
in rt2x00config.c and one in rt2x00queue.c) allowing us to make these
functions static.
Also, conditional compilations doesn't seem to be necessary anymore as
802.11n support is quite common nowadays.

This makes the code a bit easier readable and searchable.

Signed-off-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ea81966c

drivers/net/wireless/rt2x00/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ config RT2800PCI 
	select RT2800_LIB

	select RT2X00_LIB_PCI if PCI

	select RT2X00_LIB_SOC if RALINK_RT288X || RALINK_RT305X

	select RT2X00_LIB_HT

	select RT2X00_LIB_FIRMWARE

	select RT2X00_LIB_CRYPTO

	select CRC_CCITT
@@ -133,7 +132,6 @@ config RT2800USB 
	depends on USB

	select RT2800_LIB

	select RT2X00_LIB_USB

	select RT2X00_LIB_HT

	select RT2X00_LIB_FIRMWARE

	select RT2X00_LIB_CRYPTO

	select CRC_CCITT
@@ -196,9 +194,6 @@ config RT2X00_LIB_USB 
config RT2X00_LIB

	tristate



config RT2X00_LIB_HT

	boolean



config RT2X00_LIB_FIRMWARE

	boolean

	select FW_LOADER

drivers/net/wireless/rt2x00/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ rt2x00lib-$(CONFIG_RT2X00_LIB_DEBUGFS) += rt2x00debug.o 
rt2x00lib-$(CONFIG_RT2X00_LIB_CRYPTO)	+= rt2x00crypto.o

rt2x00lib-$(CONFIG_RT2X00_LIB_FIRMWARE)	+= rt2x00firmware.o

rt2x00lib-$(CONFIG_RT2X00_LIB_LEDS)	+= rt2x00leds.o

rt2x00lib-$(CONFIG_RT2X00_LIB_HT)	+= rt2x00ht.o



obj-$(CONFIG_RT2X00_LIB)		+= rt2x00lib.o

obj-$(CONFIG_RT2X00_LIB_PCI)		+= rt2x00pci.o

drivers/net/wireless/rt2x00/rt2x00config.c

+28 −0
Original line number Diff line number Diff line
@@ -163,6 +163,34 @@ void rt2x00lib_config_antenna(struct rt2x00_dev *rt2x00dev, 
		rt2x00queue_start_queue(rt2x00dev->rx);

}



static u16 rt2x00ht_center_channel(struct rt2x00_dev *rt2x00dev,

				   struct ieee80211_conf *conf)

{

	struct hw_mode_spec *spec = &rt2x00dev->spec;

	int center_channel;

	u16 i;



	/*

	 * Initialize center channel to current channel.

	 */

	center_channel = spec->channels[conf->channel->hw_value].channel;



	/*

	 * Adjust center channel to HT40+ and HT40- operation.

	 */

	if (conf_is_ht40_plus(conf))

		center_channel += 2;

	else if (conf_is_ht40_minus(conf))

		center_channel -= (center_channel == 14) ? 1 : 2;



	for (i = 0; i < spec->num_channels; i++)

		if (spec->channels[i].channel == center_channel)

			return i;



	WARN_ON(1);

	return conf->channel->hw_value;

}



void rt2x00lib_config(struct rt2x00_dev *rt2x00dev,

		      struct ieee80211_conf *conf,

		      unsigned int ieee80211_flags)

drivers/net/wireless/rt2x00/rt2x00ht.c

deleted100644 → 0
+0 −137
Original line number Diff line number Diff line 
/*

	Copyright (C) 2004 - 2009 Ivo van Doorn <IvDoorn@gmail.com>

	<http://rt2x00.serialmonkey.com>



	This program is free software; you can redistribute it and/or modify

	it under the terms of the GNU General Public License as published by

	the Free Software Foundation; either version 2 of the License, or

	(at your option) any later version.



	This program is distributed in the hope that it will be useful,

	but WITHOUT ANY WARRANTY; without even the implied warranty of

	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

	GNU General Public License for more details.



	You should have received a copy of the GNU General Public License

	along with this program; if not, write to the

	Free Software Foundation, Inc.,

	59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

 */



/*

	Module: rt2x00lib

	Abstract: rt2x00 HT specific routines.

 */



#include <linux/kernel.h>

#include <linux/module.h>



#include "rt2x00.h"

#include "rt2x00lib.h"



void rt2x00ht_create_tx_descriptor(struct queue_entry *entry,

				   struct txentry_desc *txdesc,

				   const struct rt2x00_rate *hwrate)

{

	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(entry->skb);

	struct ieee80211_tx_rate *txrate = &tx_info->control.rates[0];

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



	if (tx_info->control.sta)

		txdesc->u.ht.mpdu_density =

		    tx_info->control.sta->ht_cap.ampdu_density;



	txdesc->u.ht.ba_size = 7;	/* FIXME: What value is needed? */



	/*

	 * Only one STBC stream is supported for now.

	 */

	if (tx_info->flags & IEEE80211_TX_CTL_STBC)

		txdesc->u.ht.stbc = 1;



	/*

	 * If IEEE80211_TX_RC_MCS is set txrate->idx just contains the

	 * mcs rate to be used

	 */

	if (txrate->flags & IEEE80211_TX_RC_MCS) {

		txdesc->u.ht.mcs = txrate->idx;



		/*

		 * MIMO PS should be set to 1 for STA's using dynamic SM PS

		 * when using more then one tx stream (>MCS7).

		 */

		if (tx_info->control.sta && txdesc->u.ht.mcs > 7 &&

		    ((tx_info->control.sta->ht_cap.cap &

		      IEEE80211_HT_CAP_SM_PS) >>

		     IEEE80211_HT_CAP_SM_PS_SHIFT) ==

		    WLAN_HT_CAP_SM_PS_DYNAMIC)

			__set_bit(ENTRY_TXD_HT_MIMO_PS, &txdesc->flags);

	} else {

		txdesc->u.ht.mcs = rt2x00_get_rate_mcs(hwrate->mcs);

		if (txrate->flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE)

			txdesc->u.ht.mcs |= 0x08;

	}



	/*

	 * This frame is eligible for an AMPDU, however, don't aggregate

	 * frames that are intended to probe a specific tx rate.

	 */

	if (tx_info->flags & IEEE80211_TX_CTL_AMPDU &&

	    !(tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE))

		__set_bit(ENTRY_TXD_HT_AMPDU, &txdesc->flags);



	/*

	 * Set 40Mhz mode if necessary (for legacy rates this will

	 * duplicate the frame to both channels).

	 */

	if (txrate->flags & IEEE80211_TX_RC_40_MHZ_WIDTH ||

	    txrate->flags & IEEE80211_TX_RC_DUP_DATA)

		__set_bit(ENTRY_TXD_HT_BW_40, &txdesc->flags);

	if (txrate->flags & IEEE80211_TX_RC_SHORT_GI)

		__set_bit(ENTRY_TXD_HT_SHORT_GI, &txdesc->flags);



	/*

	 * Determine IFS values

	 * - Use TXOP_BACKOFF for management frames except beacons

	 * - Use TXOP_SIFS for fragment bursts

	 * - Use TXOP_HTTXOP for everything else

	 *

	 * Note: rt2800 devices won't use CTS protection (if used)

	 * for frames not transmitted with TXOP_HTTXOP

	 */

	if (ieee80211_is_mgmt(hdr->frame_control) &&

	    !ieee80211_is_beacon(hdr->frame_control))

		txdesc->u.ht.txop = TXOP_BACKOFF;

	else if (!(tx_info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT))

		txdesc->u.ht.txop = TXOP_SIFS;

	else

		txdesc->u.ht.txop = TXOP_HTTXOP;

}



u16 rt2x00ht_center_channel(struct rt2x00_dev *rt2x00dev,

			    struct ieee80211_conf *conf)

{

	struct hw_mode_spec *spec = &rt2x00dev->spec;

	int center_channel;

	u16 i;



	/*

	 * Initialize center channel to current channel.

	 */

	center_channel = spec->channels[conf->channel->hw_value].channel;



	/*

	 * Adjust center channel to HT40+ and HT40- operation.

	 */

	if (conf_is_ht40_plus(conf))

		center_channel += 2;

	else if (conf_is_ht40_minus(conf))

		center_channel -= (center_channel == 14) ? 1 : 2;



	for (i = 0; i < spec->num_channels; i++)

		if (spec->channels[i].channel == center_channel)

			return i;



	WARN_ON(1);

	return conf->channel->hw_value;

}

drivers/net/wireless/rt2x00/rt2x00lib.h

+0 −24
Original line number Diff line number Diff line
@@ -387,30 +387,6 @@ static inline void rt2x00crypto_rx_insert_iv(struct sk_buff *skb, 
}

#endif /* CONFIG_RT2X00_LIB_CRYPTO */



/*

 * HT handlers.

 */

#ifdef CONFIG_RT2X00_LIB_HT

void rt2x00ht_create_tx_descriptor(struct queue_entry *entry,

				   struct txentry_desc *txdesc,

				   const struct rt2x00_rate *hwrate);



u16 rt2x00ht_center_channel(struct rt2x00_dev *rt2x00dev,

			    struct ieee80211_conf *conf);

#else

static inline void rt2x00ht_create_tx_descriptor(struct queue_entry *entry,

						 struct txentry_desc *txdesc,

						 const struct rt2x00_rate *hwrate)

{

}



static inline u16 rt2x00ht_center_channel(struct rt2x00_dev *rt2x00dev,

					  struct ieee80211_conf *conf)

{

	return conf->channel->hw_value;

}

#endif /* CONFIG_RT2X00_LIB_HT */



/*

 * RFkill handlers.

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE