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

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

rt2x00: Rename CONFIG_CRYPTO_COPY_IV 



CONFIG_CRYPTO_COPY_IV is a bad name since it is part
of the driver requirements instead of a configuration option.

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

drivers/net/wireless/rt2x00/rt2500usb.c

+1 −1
Original line number Diff line number Diff line
@@ -1888,7 +1888,7 @@ static int rt2500usb_probe_hw(struct rt2x00_dev *rt2x00dev) 
	__set_bit(DRIVER_REQUIRE_SCHEDULED, &rt2x00dev->flags);

	if (!modparam_nohwcrypt) {

		__set_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags);

		__set_bit(CONFIG_CRYPTO_COPY_IV, &rt2x00dev->flags);

		__set_bit(DRIVER_REQUIRE_COPY_IV, &rt2x00dev->flags);

	}

	__set_bit(CONFIG_DISABLE_LINK_TUNING, &rt2x00dev->flags);

drivers/net/wireless/rt2x00/rt2x00.h

+1 −1
Original line number Diff line number Diff line
@@ -586,6 +586,7 @@ enum rt2x00_flags { 
	DRIVER_REQUIRE_ATIM_QUEUE,

	DRIVER_REQUIRE_SCHEDULED,

	DRIVER_REQUIRE_DMA,

	DRIVER_REQUIRE_COPY_IV,



	/*

	 * Driver features
@@ -602,7 +603,6 @@ enum rt2x00_flags { 
	CONFIG_EXTERNAL_LNA_BG,

	CONFIG_DOUBLE_ANTENNA,

	CONFIG_DISABLE_LINK_TUNING,

	CONFIG_CRYPTO_COPY_IV,

};



/*

drivers/net/wireless/rt2x00/rt2x00queue.c

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,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(CONFIG_CRYPTO_COPY_IV, &queue->rt2x00dev->flags))

		if (test_bit(DRIVER_REQUIRE_COPY_IV, &queue->rt2x00dev->flags))

			rt2x00crypto_tx_copy_iv(skb, iv_len);

		else

			rt2x00crypto_tx_remove_iv(skb, iv_len);