diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-08-08 06:25:28 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-08-08 06:26:15 -0400 |
| commit | a131bc185528331451a93db6c50a7d2070376a61 (patch) | |
| tree | 18cccd206d4835ee8df147ac3b0c0e30cc00680d /drivers/net/wireless/ath/ath5k/base.c | |
| parent | 19943b0e30b05d42e494ae6fef78156ebc8c637e (diff) | |
| parent | ff1649ff780fb7c0bfbf42d05ffc9b56336b9aa3 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Pull fixes in from 2.6.31 so that people testing the iommu-2.6.git tree
no longer trip over bugs which were already fixed (sorry, Horms).
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/base.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath5k/base.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c index ea045151f95..029c1bc7468 100644 --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c | |||
| @@ -2970,6 +2970,9 @@ ath5k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, | |||
| 2970 | if (modparam_nohwcrypt) | 2970 | if (modparam_nohwcrypt) |
| 2971 | return -EOPNOTSUPP; | 2971 | return -EOPNOTSUPP; |
| 2972 | 2972 | ||
| 2973 | if (sc->opmode == NL80211_IFTYPE_AP) | ||
| 2974 | return -EOPNOTSUPP; | ||
| 2975 | |||
| 2973 | switch (key->alg) { | 2976 | switch (key->alg) { |
| 2974 | case ALG_WEP: | 2977 | case ALG_WEP: |
| 2975 | case ALG_TKIP: | 2978 | case ALG_TKIP: |