From 96d3de9ecbab240e3824b8b52901d2dac36674cc Mon Sep 17 00:00:00 2001 From: Janusz Dziedzic Date: Wed, 8 Jun 2011 08:56:16 +0200 Subject: cw1200: enabling WAPI support Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24585 Reviewed-by: Dmitry TARNYAGIN Tested-by: Janusz DZIEDZIC Reviewed-by: Janusz DZIEDZIC Change-Id: I3eb462095c57d9462f07422c7cdd133189b0ab75 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/26977 Reviewed-by: Bartosz MARKOWSKI Tested-by: Bartosz MARKOWSKI Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33474 --- drivers/staging/cw1200/Kconfig | 7 +++++++ drivers/staging/cw1200/sta.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/staging/cw1200/Kconfig b/drivers/staging/cw1200/Kconfig index 5c6f18267e1..7ad63fa9e2c 100644 --- a/drivers/staging/cw1200/Kconfig +++ b/drivers/staging/cw1200/Kconfig @@ -45,6 +45,13 @@ config CW1200_5GHZ_SUPPORT CW1100 silicon. If unsure, say N. +config CW1200_WAPI_SUPPORT + bool "WAPI support" + depends on CW1200 + help + Say Y if your compat-wireless support WAPI. + If unsure, say N. + menu "Driver debug features" depends on CW1200 diff --git a/drivers/staging/cw1200/sta.c b/drivers/staging/cw1200/sta.c index 65df33ac61f..a5b0f0ea759 100644 --- a/drivers/staging/cw1200/sta.c +++ b/drivers/staging/cw1200/sta.c @@ -526,8 +526,8 @@ int cw1200_set_key(struct ieee80211_hw *dev, enum set_key_cmd cmd, wsm_key->aesGroupKey.keyId = key->keyidx; } break; -#if 0 - case WLAN_CIPHER_SUITE_WAPI: +#ifdef CONFIG_CW1200_WAPI_SUPPORT + case WLAN_CIPHER_SUITE_SMS4: if (pairwise) { wsm_key->type = WSM_KEY_TYPE_WAPI_PAIRWISE; memcpy(wsm_key->wapiPairwiseKey.peerAddress, @@ -546,7 +546,7 @@ int cw1200_set_key(struct ieee80211_hw *dev, enum set_key_cmd cmd, wsm_key->wapiGroupKey.keyId = key->keyidx; } break; -#endif +#endif /* CONFIG_CW1200_WAPI_SUPPORT */ default: WARN_ON(1); cw1200_free_key(priv, idx); -- cgit v1.2.3