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

Commit 7b8a00dc authored by Gabor Juhos's avatar Gabor Juhos Committed by John W. Linville
Browse files

rt2x00: rt2x00lib: use rt2x00_has_cap_* helpers 



Use the appropriate helper functions instead of
directly accessing the rt2x00dev->cap_flags field
to check device capability flags.

This improves readability of the code a bit.

Signed-off-by: default avatarGabor Juhos <juhosg@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a44d0141

drivers/net/wireless/rt2x00/rt2x00crypto.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -52,7 +52,7 @@ void rt2x00crypto_create_tx_descriptor(struct rt2x00_dev *rt2x00dev, 
	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);

	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);

	struct ieee80211_key_conf *hw_key = tx_info->control.hw_key;

	struct ieee80211_key_conf *hw_key = tx_info->control.hw_key;





	if (!test_bit(CAPABILITY_HW_CRYPTO, &rt2x00dev->cap_flags) || !hw_key)

	if (!rt2x00_has_cap_hw_crypto(rt2x00dev) || !hw_key)

		return;

		return;





	__set_bit(ENTRY_TXD_ENCRYPT, &txdesc->flags);

	__set_bit(ENTRY_TXD_ENCRYPT, &txdesc->flags);
@@ -80,7 +80,7 @@ unsigned int rt2x00crypto_tx_overhead(struct rt2x00_dev *rt2x00dev, 
	struct ieee80211_key_conf *key = tx_info->control.hw_key;

	struct ieee80211_key_conf *key = tx_info->control.hw_key;

	unsigned int overhead = 0;

	unsigned int overhead = 0;





	if (!test_bit(CAPABILITY_HW_CRYPTO, &rt2x00dev->cap_flags) || !key)

	if (!rt2x00_has_cap_hw_crypto(rt2x00dev) || !key)

		return overhead;

		return overhead;





	/*

	/*

drivers/net/wireless/rt2x00/rt2x00debug.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -750,7 +750,7 @@ void rt2x00debug_register(struct rt2x00_dev *rt2x00dev) 
				intf, &rt2x00debug_fop_queue_stats);

				intf, &rt2x00debug_fop_queue_stats);





#ifdef CONFIG_RT2X00_LIB_CRYPTO

#ifdef CONFIG_RT2X00_LIB_CRYPTO

	if (test_bit(CAPABILITY_HW_CRYPTO, &rt2x00dev->cap_flags))

	if (rt2x00_has_cap_hw_crypto(rt2x00dev))

		intf->crypto_stats_entry =

		intf->crypto_stats_entry =

		    debugfs_create_file("crypto", S_IRUGO, intf->queue_folder,

		    debugfs_create_file("crypto", S_IRUGO, intf->queue_folder,

					intf, &rt2x00debug_fop_crypto_stats);

					intf, &rt2x00debug_fop_crypto_stats);

drivers/net/wireless/rt2x00/rt2x00dev.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -88,7 +88,7 @@ int rt2x00lib_enable_radio(struct rt2x00_dev *rt2x00dev) 
	rt2x00queue_start_queues(rt2x00dev);

	rt2x00queue_start_queues(rt2x00dev);

	rt2x00link_start_tuner(rt2x00dev);

	rt2x00link_start_tuner(rt2x00dev);

	rt2x00link_start_agc(rt2x00dev);

	rt2x00link_start_agc(rt2x00dev);

	if (test_bit(CAPABILITY_VCO_RECALIBRATION, &rt2x00dev->cap_flags))

	if (rt2x00_has_cap_vco_recalibration(rt2x00dev))

		rt2x00link_start_vcocal(rt2x00dev);

		rt2x00link_start_vcocal(rt2x00dev);





	/*

	/*
@@ -113,7 +113,7 @@ void rt2x00lib_disable_radio(struct rt2x00_dev *rt2x00dev) 
	 * Stop all queues

	 * Stop all queues

	 */

	 */

	rt2x00link_stop_agc(rt2x00dev);

	rt2x00link_stop_agc(rt2x00dev);

	if (test_bit(CAPABILITY_VCO_RECALIBRATION, &rt2x00dev->cap_flags))

	if (rt2x00_has_cap_vco_recalibration(rt2x00dev))

		rt2x00link_stop_vcocal(rt2x00dev);

		rt2x00link_stop_vcocal(rt2x00dev);

	rt2x00link_stop_tuner(rt2x00dev);

	rt2x00link_stop_tuner(rt2x00dev);

	rt2x00queue_stop_queues(rt2x00dev);

	rt2x00queue_stop_queues(rt2x00dev);
@@ -234,7 +234,7 @@ void rt2x00lib_beacondone(struct rt2x00_dev *rt2x00dev) 
	 * here as they will fetch the next beacon directly prior to

	 * here as they will fetch the next beacon directly prior to

	 * transmission.

	 * transmission.

	 */

	 */

	if (test_bit(CAPABILITY_PRE_TBTT_INTERRUPT, &rt2x00dev->cap_flags))

	if (rt2x00_has_cap_pre_tbtt_interrupt(rt2x00dev))

		return;

		return;





	/* fetch next beacon */

	/* fetch next beacon */
@@ -358,7 +358,7 @@ void rt2x00lib_txdone(struct queue_entry *entry, 
	 * mac80211 will expect the same data to be present it the

	 * mac80211 will expect the same data to be present it the

	 * frame as it was passed to us.

	 * frame as it was passed to us.

	 */

	 */

	if (test_bit(CAPABILITY_HW_CRYPTO, &rt2x00dev->cap_flags))

	if (rt2x00_has_cap_hw_crypto(rt2x00dev))

		rt2x00crypto_tx_insert_iv(entry->skb, header_length);

		rt2x00crypto_tx_insert_iv(entry->skb, header_length);





	/*

	/*

drivers/net/wireless/rt2x00/rt2x00link.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -353,7 +353,7 @@ static void rt2x00link_tuner(struct work_struct *work) 
	 * do not support link tuning at all, while other devices can disable

	 * do not support link tuning at all, while other devices can disable

	 * the feature from the EEPROM.

	 * the feature from the EEPROM.

	 */

	 */

	if (test_bit(CAPABILITY_LINK_TUNING, &rt2x00dev->cap_flags))

	if (rt2x00_has_cap_link_tuning(rt2x00dev))

		rt2x00dev->ops->lib->link_tuner(rt2x00dev, qual, link->count);

		rt2x00dev->ops->lib->link_tuner(rt2x00dev, qual, link->count);





	/*

	/*
@@ -493,7 +493,7 @@ static void rt2x00link_vcocal(struct work_struct *work) 
void rt2x00link_register(struct rt2x00_dev *rt2x00dev)

void rt2x00link_register(struct rt2x00_dev *rt2x00dev)

{

{

	INIT_DELAYED_WORK(&rt2x00dev->link.agc_work, rt2x00link_agc);

	INIT_DELAYED_WORK(&rt2x00dev->link.agc_work, rt2x00link_agc);

	if (test_bit(CAPABILITY_VCO_RECALIBRATION, &rt2x00dev->cap_flags))

	if (rt2x00_has_cap_vco_recalibration(rt2x00dev))

		INIT_DELAYED_WORK(&rt2x00dev->link.vco_work, rt2x00link_vcocal);

		INIT_DELAYED_WORK(&rt2x00dev->link.vco_work, rt2x00link_vcocal);

	INIT_DELAYED_WORK(&rt2x00dev->link.watchdog_work, rt2x00link_watchdog);

	INIT_DELAYED_WORK(&rt2x00dev->link.watchdog_work, rt2x00link_watchdog);

	INIT_DELAYED_WORK(&rt2x00dev->link.work, rt2x00link_tuner);

	INIT_DELAYED_WORK(&rt2x00dev->link.work, rt2x00link_tuner);

drivers/net/wireless/rt2x00/rt2x00mac.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -382,11 +382,11 @@ void rt2x00mac_configure_filter(struct ieee80211_hw *hw, 
	 * of different types, but has no a separate filter for PS Poll frames,

	 * of different types, but has no a separate filter for PS Poll frames,

	 * FIF_CONTROL flag implies FIF_PSPOLL.

	 * FIF_CONTROL flag implies FIF_PSPOLL.

	 */

	 */

	if (!test_bit(CAPABILITY_CONTROL_FILTERS, &rt2x00dev->cap_flags)) {

	if (!rt2x00_has_cap_control_filters(rt2x00dev)) {

		if (*total_flags & FIF_CONTROL || *total_flags & FIF_PSPOLL)

		if (*total_flags & FIF_CONTROL || *total_flags & FIF_PSPOLL)

			*total_flags |= FIF_CONTROL | FIF_PSPOLL;

			*total_flags |= FIF_CONTROL | FIF_PSPOLL;

	}

	}

	if (!test_bit(CAPABILITY_CONTROL_FILTER_PSPOLL, &rt2x00dev->cap_flags)) {

	if (!rt2x00_has_cap_control_filter_pspoll(rt2x00dev)) {

		if (*total_flags & FIF_CONTROL)

		if (*total_flags & FIF_CONTROL)

			*total_flags |= FIF_PSPOLL;

			*total_flags |= FIF_PSPOLL;

	}

	}
@@ -469,7 +469,7 @@ int rt2x00mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
	if (!test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags))

	if (!test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags))

		return 0;

		return 0;





	if (!test_bit(CAPABILITY_HW_CRYPTO, &rt2x00dev->cap_flags))

	if (!rt2x00_has_cap_hw_crypto(rt2x00dev))

		return -EOPNOTSUPP;

		return -EOPNOTSUPP;





	/*

	/*