diff options
| author | Sean MacLennan <seanm@seanm.ca> | 2011-12-19 23:21:41 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-22 13:48:59 -0800 |
| commit | 0ddcf5fdfac6bd80e153ee5c405bdfc9cb868b95 (patch) | |
| tree | 521df3600ec21e1ffe93b40f8d64c72d8419d48e /drivers/staging/rtl8192e/rtllib_module.c | |
| parent | 32c44cb5b9fdc6eaa445bd622008dd672a3dd1a7 (diff) | |
| download | op-kernel-dev-0ddcf5fdfac6bd80e153ee5c405bdfc9cb868b95.zip op-kernel-dev-0ddcf5fdfac6bd80e153ee5c405bdfc9cb868b95.tar.gz | |
staging/rtl8192e: Convert to lib80211_crypt_info
Convert rtllib to use lib80211_crypt_info.
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 | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/staging/rtl8192e/rtllib_module.c b/drivers/staging/rtl8192e/rtllib_module.c index f089267..35ea93d 100644 --- a/drivers/staging/rtl8192e/rtllib_module.c +++ b/drivers/staging/rtl8192e/rtllib_module.c @@ -137,10 +137,10 @@ struct net_device *alloc_rtllib(int sizeof_priv) ieee->ieee802_1x = 1; /* Default to supporting 802.1x */ /* SAM Init here */ - INIT_LIST_HEAD(&ieee->crypt_deinit_list); - _setup_timer(&ieee->crypt_deinit_timer, + INIT_LIST_HEAD(&ieee->crypt_info.crypt_deinit_list); + _setup_timer(&ieee->crypt_info.crypt_deinit_timer, rtllib_crypt_deinit_handler, - (unsigned long) ieee); + (unsigned long)&ieee->crypt_info); ieee->rtllib_ap_sec_type = rtllib_ap_sec_type; spin_lock_init(&ieee->lock); @@ -197,16 +197,18 @@ void free_rtllib(struct net_device *dev) kfree(ieee->pHTInfo); ieee->pHTInfo = NULL; rtllib_softmac_free(ieee); - del_timer_sync(&ieee->crypt_deinit_timer); - rtllib_crypt_deinit_entries(ieee, 1); + + /* 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[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[i] = NULL; + ieee->crypt_info.crypt[i] = NULL; } } |
