I believe I would prefer the version I just sent, that moves nohwcrypt to ath_common...
John
On Wed, Jan 05, 2011 at 09:39:59AM -0500, John W. Linville wrote:
> Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
> ---
> drivers/net/wireless/ath/ath5k/base.c | 4 ++--
> drivers/net/wireless/ath/ath5k/mac80211-ops.c | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
> index fce9a98..019a74d 100644
> --- a/drivers/net/wireless/ath/ath5k/base.c
> +++ b/drivers/net/wireless/ath/ath5k/base.c
> @@ -61,8 +61,8 @@
> #include "debug.h"
> #include "ani.h"
>
> -int modparam_nohwcrypt;
> -module_param_named(nohwcrypt, modparam_nohwcrypt, bool, S_IRUGO);
> +int ath5k_modparam_nohwcrypt;
> +module_param_named(nohwcrypt, ath5k_modparam_nohwcrypt, bool, S_IRUGO);
> MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");
>
> static int modparam_all_channels;
> diff --git a/drivers/net/wireless/ath/ath5k/mac80211-ops.c b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
> index de257a3..d76d68c 100644
> --- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
> +++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
> @@ -46,7 +46,7 @@
> #include "base.h"
> #include "reg.h"
>
> -extern int modparam_nohwcrypt;
> +extern int ath5k_modparam_nohwcrypt;
>
> /* functions used from base.c */
> void set_beacon_filter(struct ieee80211_hw *hw, bool enable);
> @@ -485,7 +485,7 @@ ath5k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
> struct ath_common *common = ath5k_hw_common(ah);
> int ret = 0;
>
> - if (modparam_nohwcrypt)
> + if (ath5k_modparam_nohwcrypt)
> return -EOPNOTSUPP;
>
> switch (key->cipher) {
> --
> 1.7.3.4
>
>
--
John W. Linville Someday the world will need a hero, and you
linville@xxxxxxxxxxxxx might be all we have. Be ready.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
