Commit 18cb6e32 authored by John W. Linville's avatar John W. Linville
Browse files

ath5k: qualify global modparam_nohwcrypt variable 



Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3e6109c5

drivers/net/wireless/ath/ath5k/base.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/net/wireless/ath/ath5k/mac80211-ops.c

+2 −2
Original line number Diff line number Diff line
@@ -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) {