Commit b9d305cc authored by Fred Chou's avatar Fred Chou Committed by Kalle Valo
Browse files

rt2x00: use helper to check capability/requirement 



Use rt2x00_has_cap_flag macro to check rt2x00dev->cap_flags.

Signed-off-by: default avatarFred Chou <fred.chou.nd@gmail.com>
Acked-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent c20e7789

drivers/net/wireless/rt2x00/rt2x00config.c

+2 −2
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ void rt2x00lib_config(struct rt2x00_dev *rt2x00dev, 
		rt2x00dev->rf_channel = libconf.rf.channel;

	}



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

	if (rt2x00_has_cap_flag(rt2x00dev, REQUIRE_PS_AUTOWAKE) &&

	    (ieee80211_flags & IEEE80211_CONF_CHANGE_PS))

		cancel_delayed_work_sync(&rt2x00dev->autowakeup_work);
@@ -257,7 +257,7 @@ void rt2x00lib_config(struct rt2x00_dev *rt2x00dev, 
		rt2x00link_reset_tuner(rt2x00dev, false);



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

	    test_bit(REQUIRE_PS_AUTOWAKE, &rt2x00dev->cap_flags) &&

	    rt2x00_has_cap_flag(rt2x00dev, REQUIRE_PS_AUTOWAKE) &&

	    (ieee80211_flags & IEEE80211_CONF_CHANGE_PS) &&

	    (conf->flags & IEEE80211_CONF_PS)) {

		beacon_diff = (long)jiffies - (long)rt2x00dev->last_beacon;

drivers/net/wireless/rt2x00/rt2x00dev.c

+9 −9
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ void rt2x00lib_txdone(struct queue_entry *entry, 
	/*

	 * Remove L2 padding which was added during

	 */

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

	if (rt2x00_has_cap_flag(rt2x00dev, REQUIRE_L2PAD))

		rt2x00queue_remove_l2pad(entry->skb, header_length);



	/*
@@ -460,7 +460,7 @@ void rt2x00lib_txdone(struct queue_entry *entry, 
	 * send the status report back.

	 */

	if (!(skbdesc_flags & SKBDESC_NOT_MAC80211)) {

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

		if (rt2x00_has_cap_flag(rt2x00dev, REQUIRE_TASKLET_CONTEXT))

			ieee80211_tx_status(rt2x00dev->hw, entry->skb);

		else

			ieee80211_tx_status_ni(rt2x00dev->hw, entry->skb);
@@ -1056,9 +1056,9 @@ static int rt2x00lib_probe_hw(struct rt2x00_dev *rt2x00dev) 
	/*

	 * Take TX headroom required for alignment into account.

	 */

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

	if (rt2x00_has_cap_flag(rt2x00dev, REQUIRE_L2PAD))

		rt2x00dev->hw->extra_tx_headroom += RT2X00_L2PAD_SIZE;

	else if (test_bit(REQUIRE_DMA, &rt2x00dev->cap_flags))

	else if (rt2x00_has_cap_flag(rt2x00dev, REQUIRE_DMA))

		rt2x00dev->hw->extra_tx_headroom += RT2X00_ALIGN_SIZE;



	/*
@@ -1069,7 +1069,7 @@ static int rt2x00lib_probe_hw(struct rt2x00_dev *rt2x00dev) 
	/*

	 * Allocate tx status FIFO for driver use.

	 */

	if (test_bit(REQUIRE_TXSTATUS_FIFO, &rt2x00dev->cap_flags)) {

	if (rt2x00_has_cap_flag(rt2x00dev, REQUIRE_TXSTATUS_FIFO)) {

		/*

		 * Allocate the txstatus fifo. In the worst case the tx

		 * status fifo has to hold the tx status of all entries
@@ -1131,7 +1131,7 @@ static void rt2x00lib_uninitialize(struct rt2x00_dev *rt2x00dev) 
	/*

	 * Stop rfkill polling.

	 */

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

	if (rt2x00_has_cap_flag(rt2x00dev, REQUIRE_DELAYED_RFKILL))

		rt2x00rfkill_unregister(rt2x00dev);



	/*
@@ -1173,7 +1173,7 @@ static int rt2x00lib_initialize(struct rt2x00_dev *rt2x00dev) 
	/*

	 * Start rfkill polling.

	 */

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

	if (rt2x00_has_cap_flag(rt2x00dev, REQUIRE_DELAYED_RFKILL))

		rt2x00rfkill_register(rt2x00dev);



	return 0;
@@ -1389,7 +1389,7 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev) 
	/*

	 * Start rfkill polling.

	 */

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

	if (!rt2x00_has_cap_flag(rt2x00dev, REQUIRE_DELAYED_RFKILL))

		rt2x00rfkill_register(rt2x00dev);



	return 0;
@@ -1408,7 +1408,7 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev) 
	/*

	 * Stop rfkill polling.

	 */

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

	if (!rt2x00_has_cap_flag(rt2x00dev, REQUIRE_DELAYED_RFKILL))

		rt2x00rfkill_unregister(rt2x00dev);



	/*

drivers/net/wireless/rt2x00/rt2x00firmware.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ int rt2x00lib_load_firmware(struct rt2x00_dev *rt2x00dev) 
{

	int retval;



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

	if (!rt2x00_has_cap_flag(rt2x00dev, REQUIRE_FIRMWARE))

		return 0;



	if (!rt2x00dev->fw) {

drivers/net/wireless/rt2x00/rt2x00mac.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ void rt2x00mac_tx(struct ieee80211_hw *hw, 
	 * Use the ATIM queue if appropriate and present.

	 */

	if (tx_info->flags & IEEE80211_TX_CTL_SEND_AFTER_DTIM &&

	    test_bit(REQUIRE_ATIM_QUEUE, &rt2x00dev->cap_flags))

	    rt2x00_has_cap_flag(rt2x00dev, REQUIRE_ATIM_QUEUE))

		qid = QID_ATIM;



	queue = rt2x00queue_get_tx_queue(rt2x00dev, qid);

drivers/net/wireless/rt2x00/rt2x00queue.c

+9 −9
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ struct sk_buff *rt2x00queue_alloc_rxskb(struct queue_entry *entry, gfp_t gfp) 
	memset(skbdesc, 0, sizeof(*skbdesc));

	skbdesc->entry = entry;



	if (test_bit(REQUIRE_DMA, &rt2x00dev->cap_flags)) {

	if (rt2x00_has_cap_flag(rt2x00dev, REQUIRE_DMA)) {

		dma_addr_t skb_dma;



		skb_dma = dma_map_single(rt2x00dev->dev, skb->data, skb->len,
@@ -198,7 +198,7 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev, 


	__set_bit(ENTRY_TXD_GENERATE_SEQ, &txdesc->flags);



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

	if (!rt2x00_has_cap_flag(rt2x00dev, REQUIRE_SW_SEQNO)) {

		/*

		 * rt2800 has a H/W (or F/W) bug, device incorrectly increase

		 * seqno on retransmited data (non-QOS) frames. To workaround
@@ -484,7 +484,7 @@ static void rt2x00queue_create_tx_descriptor(struct rt2x00_dev *rt2x00dev, 
	rt2x00crypto_create_tx_descriptor(rt2x00dev, skb, txdesc);

	rt2x00queue_create_tx_descriptor_seq(rt2x00dev, skb, txdesc);



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

	if (rt2x00_has_cap_flag(rt2x00dev, REQUIRE_HT_TX_DESC))

		rt2x00queue_create_tx_descriptor_ht(rt2x00dev, skb, txdesc,

						   sta, hwrate);

	else
@@ -526,7 +526,7 @@ static int rt2x00queue_write_tx_data(struct queue_entry *entry, 
	/*

	 * Map the skb to DMA.

	 */

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

	if (rt2x00_has_cap_flag(rt2x00dev, REQUIRE_DMA) &&

	    rt2x00queue_map_txskb(entry))

		return -ENOMEM;
@@ -646,7 +646,7 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb, 
	 */

	if (test_bit(ENTRY_TXD_ENCRYPT, &txdesc.flags) &&

	    !test_bit(ENTRY_TXD_ENCRYPT_IV, &txdesc.flags)) {

		if (test_bit(REQUIRE_COPY_IV, &queue->rt2x00dev->cap_flags))

		if (rt2x00_has_cap_flag(queue->rt2x00dev, REQUIRE_COPY_IV))

			rt2x00crypto_tx_copy_iv(skb, &txdesc);

		else

			rt2x00crypto_tx_remove_iv(skb, &txdesc);
@@ -660,9 +660,9 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb, 
	 * PCI and USB devices, while header alignment only is valid

	 * for PCI devices.

	 */

	if (test_bit(REQUIRE_L2PAD, &queue->rt2x00dev->cap_flags))

	if (rt2x00_has_cap_flag(queue->rt2x00dev, REQUIRE_L2PAD))

		rt2x00queue_insert_l2pad(skb, txdesc.header_length);

	else if (test_bit(REQUIRE_DMA, &queue->rt2x00dev->cap_flags))

	else if (rt2x00_has_cap_flag(queue->rt2x00dev, REQUIRE_DMA))

		rt2x00queue_align_frame(skb);



	/*
@@ -1178,7 +1178,7 @@ int rt2x00queue_initialize(struct rt2x00_dev *rt2x00dev) 
	if (status)

		goto exit;



	if (test_bit(REQUIRE_ATIM_QUEUE, &rt2x00dev->cap_flags)) {

	if (rt2x00_has_cap_flag(rt2x00dev, REQUIRE_ATIM_QUEUE)) {

		status = rt2x00queue_alloc_entries(rt2x00dev->atim);

		if (status)

			goto exit;
@@ -1234,7 +1234,7 @@ int rt2x00queue_allocate(struct rt2x00_dev *rt2x00dev) 
	struct data_queue *queue;

	enum data_queue_qid qid;

	unsigned int req_atim =

	    !!test_bit(REQUIRE_ATIM_QUEUE, &rt2x00dev->cap_flags);

	    rt2x00_has_cap_flag(rt2x00dev, REQUIRE_ATIM_QUEUE);



	/*

	 * We need the following queues:

CRA Git | Maintained and supported by SUSTech CRA and CCSE