From 32c44cb5b9fdc6eaa445bd622008dd672a3dd1a7 Mon Sep 17 00:00:00 2001 From: Sean MacLennan Date: Mon, 19 Dec 2011 23:20:41 -0500 Subject: staging/rtl8192e: Convert to lib80211_crypt_data and lib80211_crypt_ops Convert rtllib_crypt_data to lib80211_crypt_data and rtllib_crypt_ops to lib80211_crypt_ops. This is almost a 1:1 replacement, only extra_prefix_len and extra_postfix_len changed. Signed-off-by: Sean MacLennan Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8192e/rtllib_module.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/staging/rtl8192e/rtllib_module.c') diff --git a/drivers/staging/rtl8192e/rtllib_module.c b/drivers/staging/rtl8192e/rtllib_module.c index 63d553f..f089267 100644 --- a/drivers/staging/rtl8192e/rtllib_module.c +++ b/drivers/staging/rtl8192e/rtllib_module.c @@ -136,6 +136,7 @@ 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_deinit_list); _setup_timer(&ieee->crypt_deinit_timer, rtllib_crypt_deinit_handler, @@ -200,7 +201,7 @@ void free_rtllib(struct net_device *dev) rtllib_crypt_deinit_entries(ieee, 1); for (i = 0; i < NUM_WEP_KEYS; i++) { - struct rtllib_crypt_data *crypt = ieee->crypt[i]; + struct lib80211_crypt_data *crypt = ieee->crypt[i]; if (crypt) { if (crypt->ops) crypt->ops->deinit(crypt->priv); -- cgit v1.1