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

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

rt2x00: Add module parameter to disable HW crypto 



Add a module parameter to rt61 and rt73 to disable
HW crypto. The option should only be checked when
determining if the SUPPORT_HW_CRYPTO flag should
be set or not.

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

drivers/net/wireless/rt2x00/rt61pci.c

+9 −1
Original line number Diff line number Diff line
@@ -37,6 +37,13 @@ 
#include "rt2x00pci.h"

#include "rt61pci.h"



/*

 * Allow hardware encryption to be disabled.

 */

static int modparam_nohwcrypt = 0;

module_param_named(nohwcrypt, modparam_nohwcrypt, bool, S_IRUGO);

MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");



/*

 * Register access.

 * BBP and RF register require indirect register access,
@@ -2617,6 +2624,7 @@ static int rt61pci_probe_hw(struct rt2x00_dev *rt2x00dev) 
	 */

	__set_bit(DRIVER_REQUIRE_FIRMWARE, &rt2x00dev->flags);

	__set_bit(DRIVER_REQUIRE_DMA, &rt2x00dev->flags);

	if (!modparam_nohwcrypt)

		__set_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags);



	/*

drivers/net/wireless/rt2x00/rt73usb.c

+9 −1
Original line number Diff line number Diff line
@@ -36,6 +36,13 @@ 
#include "rt2x00usb.h"

#include "rt73usb.h"



/*

 * Allow hardware encryption to be disabled.

 */

static int modparam_nohwcrypt = 0;

module_param_named(nohwcrypt, modparam_nohwcrypt, bool, S_IRUGO);

MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");



/*

 * Register access.

 * All access to the CSR registers will go through the methods
@@ -2211,6 +2218,7 @@ static int rt73usb_probe_hw(struct rt2x00_dev *rt2x00dev) 
	 */

	__set_bit(DRIVER_REQUIRE_FIRMWARE, &rt2x00dev->flags);

	__set_bit(DRIVER_REQUIRE_SCHEDULED, &rt2x00dev->flags);

	if (!modparam_nohwcrypt)

		__set_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags);



	/*