diff options
| author | Juuso Oikarinen <juuso.oikarinen@nokia.com> | 2010-02-18 13:25:49 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-02-19 15:52:45 -0500 |
| commit | fddc7dd7deaa400db314b214d92de95f865a8af0 (patch) | |
| tree | ff32662f25961a3dca9b5e1595fb1f66efcbb071 | |
| parent | 6c71b0ea761da416af54df4f72f48e71050cc012 (diff) | |
| download | linux-topics-fddc7dd7deaa400db314b214d92de95f865a8af0.tar.gz | |
wl1271: Fix key-remove error
The new firmware does not allow removal of unicast keys - they will be
automatically removed on the next CMD_JOIN.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Kalle Valo <kalle.valo@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_main.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c index 9de7df76f53..4a0a15bcd67 100644 --- a/drivers/net/wireless/wl12xx/wl1271_main.c +++ b/drivers/net/wireless/wl12xx/wl1271_main.c @@ -1478,6 +1478,13 @@ static int wl1271_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, break; case DISABLE_KEY: + /* The wl1271 does not allow to remove unicast keys - they + will be cleared automatically on next CMD_JOIN. Ignore the + request silently, as we dont want the mac80211 to emit + an error message. */ + if (!is_broadcast_ether_addr(addr)) + break; + ret = wl1271_cmd_set_key(wl, KEY_REMOVE, key_conf->keyidx, key_type, key_conf->keylen, key_conf->key, |