mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
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: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
7396faf4f3
commit
3f787bd6d5
3 changed files with 3 additions and 3 deletions
|
@ -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);
|
||||
|
||||
|
|
|
@ -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,
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue