diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-23 22:03:51 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-23 22:03:51 -0400 |
| commit | 74d154189d597b91da4322996dbf4f5c3d1544ab (patch) | |
| tree | 6f09861b5e2f875d2d8ea2127b16add9103221c6 /drivers/net/wireless/ath/ath5k | |
| parent | 5a6338db37885af06760d40cad589316e48431e9 (diff) | |
| parent | ffafa60d496f80c250f2ae0340ae94434c0b0b4d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwmc3200wifi/netdev.c
net/wireless/scan.c
Diffstat (limited to 'drivers/net/wireless/ath/ath5k')
| -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 20ba6fa5f1f1..7db32ce3dbd8 100644 --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c | |||
| @@ -2980,6 +2980,9 @@ ath5k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, | |||
| 2980 | if (modparam_nohwcrypt) | 2980 | if (modparam_nohwcrypt) |
| 2981 | return -EOPNOTSUPP; | 2981 | return -EOPNOTSUPP; |
| 2982 | 2982 | ||
| 2983 | if (sc->opmode == NL80211_IFTYPE_AP) | ||
| 2984 | return -EOPNOTSUPP; | ||
| 2985 | |||
| 2983 | switch (key->alg) { | 2986 | switch (key->alg) { |
| 2984 | case ALG_WEP: | 2987 | case ALG_WEP: |
| 2985 | case ALG_TKIP: | 2988 | case ALG_TKIP: |