Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a010a337 authored by Herton Ronaldo Krzesinski's avatar Herton Ronaldo Krzesinski Committed by Greg Kroah-Hartman
Browse files

Staging: rtl8187se/rtl8192e/rtl8192su: allow module unload 



On rtl81* additions, they had its wireless stack made builtin instead of
separated modules. But try_module_get/module_put in stack were kept,
they are uneeded with the stack builtin and makes rtl81* modules
impossible to remove on a system with an rtl81* card. request_module
calls are also uneeded with stack builtin, so remove them too.

Signed-off-by: default avatarHerton Ronaldo Krzesinski <herton@mandriva.com.br>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 557c0288

drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c

+1 −3
Original line number Diff line number Diff line
@@ -53,10 +53,8 @@ void ieee80211_crypt_deinit_entries(struct ieee80211_device *ieee, 


		list_del(ptr);



		if (entry->ops) {

		if (entry->ops)

			entry->ops->deinit(entry->priv);

			module_put(entry->ops->owner);

		}

		kfree(entry);

	}

}

drivers/staging/rtl8187se/ieee80211/ieee80211_module.c

+1 −3
Original line number Diff line number Diff line
@@ -189,10 +189,8 @@ void free_ieee80211(struct net_device *dev) 
	for (i = 0; i < WEP_KEYS; i++) {

		struct ieee80211_crypt_data *crypt = ieee->crypt[i];

		if (crypt) {

			if (crypt->ops) {

			if (crypt->ops)

				crypt->ops->deinit(crypt->priv);

				module_put(crypt->ops->owner);

			}

			kfree(crypt);

			ieee->crypt[i] = NULL;

		}

drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c

+4 −8
Original line number Diff line number Diff line
@@ -2839,16 +2839,12 @@ static int ieee80211_wpa_set_encryption(struct ieee80211_device *ieee, 
		goto skip_host_crypt;



	ops = ieee80211_get_crypto_ops(param->u.crypt.alg);

	if (ops == NULL && strcmp(param->u.crypt.alg, "WEP") == 0) {

		request_module("ieee80211_crypt_wep");

	if (ops == NULL && strcmp(param->u.crypt.alg, "WEP") == 0)

		ops = ieee80211_get_crypto_ops(param->u.crypt.alg);

	} else if (ops == NULL && strcmp(param->u.crypt.alg, "TKIP") == 0) {

		request_module("ieee80211_crypt_tkip");

	else if (ops == NULL && strcmp(param->u.crypt.alg, "TKIP") == 0)

		ops = ieee80211_get_crypto_ops(param->u.crypt.alg);

	} else if (ops == NULL && strcmp(param->u.crypt.alg, "CCMP") == 0) {

		request_module("ieee80211_crypt_ccmp");

	else if (ops == NULL && strcmp(param->u.crypt.alg, "CCMP") == 0)

		ops = ieee80211_get_crypto_ops(param->u.crypt.alg);

	}

	if (ops == NULL) {

		printk("unknown crypto alg '%s'\n", param->u.crypt.alg);

		param->u.crypt.err = IEEE_CRYPT_ERR_UNKNOWN_ALG;
@@ -2869,7 +2865,7 @@ static int ieee80211_wpa_set_encryption(struct ieee80211_device *ieee, 
		}

		memset(new_crypt, 0, sizeof(struct ieee80211_crypt_data));

		new_crypt->ops = ops;

		if (new_crypt->ops && try_module_get(new_crypt->ops->owner))

		if (new_crypt->ops)

			new_crypt->priv =

				new_crypt->ops->init(param->u.crypt.idx);

drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c

+5 −12
Original line number Diff line number Diff line
@@ -331,12 +331,10 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee, 
			return -ENOMEM;

		memset(new_crypt, 0, sizeof(struct ieee80211_crypt_data));

		new_crypt->ops = ieee80211_get_crypto_ops("WEP");

		if (!new_crypt->ops) {

			request_module("ieee80211_crypt_wep");

		if (!new_crypt->ops)

			new_crypt->ops = ieee80211_get_crypto_ops("WEP");

		}



		if (new_crypt->ops && try_module_get(new_crypt->ops->owner))

		if (new_crypt->ops)

			new_crypt->priv = new_crypt->ops->init(key);



		if (!new_crypt->ops || !new_crypt->priv) {
@@ -483,7 +481,7 @@ int ieee80211_wx_set_encode_ext(struct ieee80211_device *ieee, 
        struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;

        int i, idx, ret = 0;

        int group_key = 0;

        const char *alg, *module;

        const char *alg;

        struct ieee80211_crypto_ops *ops;

        struct ieee80211_crypt_data **crypt;
@@ -539,15 +537,12 @@ int ieee80211_wx_set_encode_ext(struct ieee80211_device *ieee, 
        switch (ext->alg) {

        case IW_ENCODE_ALG_WEP:

                alg = "WEP";

                module = "ieee80211_crypt_wep";

                break;

        case IW_ENCODE_ALG_TKIP:

                alg = "TKIP";

                module = "ieee80211_crypt_tkip";

                break;

        case IW_ENCODE_ALG_CCMP:

                alg = "CCMP";

                module = "ieee80211_crypt_ccmp";

                break;

        default:

                IEEE80211_DEBUG_WX("%s: unknown crypto alg %d\n",
@@ -558,10 +553,8 @@ int ieee80211_wx_set_encode_ext(struct ieee80211_device *ieee, 
//	printk("8-09-08-9=====>%s, alg name:%s\n",__func__, alg);



	 ops = ieee80211_get_crypto_ops(alg);

        if (ops == NULL) {

                request_module(module);

        if (ops == NULL)

                ops = ieee80211_get_crypto_ops(alg);

        }

        if (ops == NULL) {

                IEEE80211_DEBUG_WX("%s: unknown crypto alg %d\n",

                                   dev->name, ext->alg);
@@ -581,7 +574,7 @@ int ieee80211_wx_set_encode_ext(struct ieee80211_device *ieee, 
                        goto done;

                }

                new_crypt->ops = ops;

                if (new_crypt->ops && try_module_get(new_crypt->ops->owner))

                if (new_crypt->ops)

                        new_crypt->priv = new_crypt->ops->init(idx);

                if (new_crypt->priv == NULL) {

                        kfree(new_crypt);

drivers/staging/rtl8192e/ieee80211/ieee80211_crypt.c

+1 −7
Original line number Diff line number Diff line
@@ -53,14 +53,8 @@ void ieee80211_crypt_deinit_entries(struct ieee80211_device *ieee, 


		list_del(ptr);



		if (entry->ops) {

		if (entry->ops)

			entry->ops->deinit(entry->priv);

#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)

			module_put(entry->ops->owner);

#else

			__MOD_DEC_USE_COUNT(entry->ops->owner);

#endif

		}

		kfree(entry);

	}

}