diff options
| author | Sean MacLennan <seanm@seanm.ca> | 2011-12-20 04:23:08 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-22 21:48:59 (GMT) |
| commit | 3b148be0df8e45a0259d7e84001cf02e897af614 (patch) | |
| tree | cfd94e59751c9f102590b1dd348b488f60708366 /drivers/staging/rtl8192e/rtllib_module.c | |
| parent | 0ddcf5fdfac6bd80e153ee5c405bdfc9cb868b95 (diff) | |
| download | linux-fsl-qoriq-3b148be0df8e45a0259d7e84001cf02e897af614.tar.xz | |
staging/rtl8192e: Register against lib80211
Convert rtllib from registering the crypt drivers against rtllib_crypt
and instead register the against lib80211. The crypto functions have
R- prepended (R-CCMP, R-TKIP, R-WEP) so they will not clash with the
lib80211 versions.
We cannot use the lib80211 crypt drivers since the rtl8192e has some
hardware support that is not handled by the lib80211 crypt drivers.
Signed-off-by: Sean MacLennan <seanm@seanm.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192e/rtllib_module.c')
| -rw-r--r-- | drivers/staging/rtl8192e/rtllib_module.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/drivers/staging/rtl8192e/rtllib_module.c b/drivers/staging/rtl8192e/rtllib_module.c index 35ea93d..f9dae95 100644 --- a/drivers/staging/rtl8192e/rtllib_module.c +++ b/drivers/staging/rtl8192e/rtllib_module.c @@ -136,11 +136,6 @@ struct net_device *alloc_rtllib(int sizeof_priv) ieee->host_decrypt = 1; ieee->ieee802_1x = 1; /* Default to supporting 802.1x */ - /* SAM Init here */ - INIT_LIST_HEAD(&ieee->crypt_info.crypt_deinit_list); - _setup_timer(&ieee->crypt_info.crypt_deinit_timer, - rtllib_crypt_deinit_handler, - (unsigned long)&ieee->crypt_info); ieee->rtllib_ap_sec_type = rtllib_ap_sec_type; spin_lock_init(&ieee->lock); @@ -150,6 +145,9 @@ struct net_device *alloc_rtllib(int sizeof_priv) atomic_set(&(ieee->atm_chnlop), 0); atomic_set(&(ieee->atm_swbw), 0); + /* SAM FIXME */ + lib80211_crypt_info_init(&ieee->crypt_info, "RTLLIB", &ieee->lock); + ieee->bHalfNMode = false; ieee->wpa_enabled = 0; ieee->tkip_countermeasures = 0; @@ -192,25 +190,12 @@ void free_rtllib(struct net_device *dev) { struct rtllib_device *ieee = (struct rtllib_device *) netdev_priv_rsl(dev); - int i; kfree(ieee->pHTInfo); ieee->pHTInfo = NULL; rtllib_softmac_free(ieee); - /* SAM cleanup */ - del_timer_sync(&ieee->crypt_info.crypt_deinit_timer); - rtllib_crypt_deinit_entries(&ieee->crypt_info, 1); - - for (i = 0; i < NUM_WEP_KEYS; i++) { - struct lib80211_crypt_data *crypt = ieee->crypt_info.crypt[i]; - if (crypt) { - if (crypt->ops) - crypt->ops->deinit(crypt->priv); - kfree(crypt); - ieee->crypt_info.crypt[i] = NULL; - } - } + lib80211_crypt_info_free(&ieee->crypt_info); rtllib_networks_free(ieee); free_netdev(dev); |