aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwmc3200wifi/main.c
diff options
context:
space:
mode:
authorSamuel Ortiz <samuel.ortiz@intel.com>2009-06-15 15:59:52 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-07-10 14:57:51 -0400
commit13e0fe70960e95cdea89b71aa3d046ec71efac8c (patch)
tree3cb98cc48285bac0b368f5ff2f3a97bad15cefc4 /drivers/net/wireless/iwmc3200wifi/main.c
parenta70742f167424bab794ca74b9e99b598b358bb7d (diff)
iwmc3200wifi: cfg80211 key hooks implemetation
This patch implements the new cfg80211 privacy related hooks: add/get/set_key and the set_default_key one. With this implementation we can now call the wext-compat *encode* routines and reduce our own wext code. Signed-off-by: Samuel Ortiz <samuel.ortiz@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi/main.c')
-rw-r--r--drivers/net/wireless/iwmc3200wifi/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/main.c b/drivers/net/wireless/iwmc3200wifi/main.c
index 844872213a12..7f56c06a53db 100644
--- a/drivers/net/wireless/iwmc3200wifi/main.c
+++ b/drivers/net/wireless/iwmc3200wifi/main.c
@@ -230,7 +230,7 @@ int iwm_priv_init(struct iwm_priv *iwm)
230 for (i = 0; i < IWM_NUM_KEYS; i++) 230 for (i = 0; i < IWM_NUM_KEYS; i++)
231 memset(&iwm->keys[i], 0, sizeof(struct iwm_key)); 231 memset(&iwm->keys[i], 0, sizeof(struct iwm_key));
232 232
233 iwm->default_key = NULL; 233 iwm->default_key = -1;
234 234
235 init_timer(&iwm->watchdog); 235 init_timer(&iwm->watchdog);
236 iwm->watchdog.function = iwm_watchdog; 236 iwm->watchdog.function = iwm_watchdog;
@@ -709,7 +709,7 @@ int __iwm_down(struct iwm_priv *iwm)
709 iwm->umac_profile = NULL; 709 iwm->umac_profile = NULL;
710 iwm_bss_list_clean(iwm); 710 iwm_bss_list_clean(iwm);
711 711
712 iwm->default_key = NULL; 712 iwm->default_key = -1;
713 iwm->core_enabled = 0; 713 iwm->core_enabled = 0;
714 714
715 ret = iwm_bus_disable(iwm); 715 ret = iwm_bus_disable(iwm);