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: Gertjan van Wingerde <gwingerde@gmail.com> Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
committed by
John W. Linville
parent
ea81966ccc
commit
46a01ec00d
@ -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.
|
||||
*/
|
||||
|
Reference in New Issue
Block a user