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

Commit c6a91aba authored by Mateusz Kulikowski's avatar Mateusz Kulikowski Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Remove RTLLIB_DEBUG_WX() 



Use netdev_dbg() instead of RTLLIB_DEBUG_WX().
Rewrite some messages to be more readable.

Signed-off-by: default avatarMateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f0dddb1d

drivers/staging/rtl8192e/rtllib.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -703,7 +703,6 @@ do { \ 
#define RTLLIB_DL_ERR	   (1<<31)

#define RTLLIB_DL_ERR	   (1<<31)

#define RTLLIB_DEBUG_INFO(f, a...)   RTLLIB_DEBUG(RTLLIB_DL_INFO, f, ## a)

#define RTLLIB_DEBUG_INFO(f, a...)   RTLLIB_DEBUG(RTLLIB_DL_INFO, f, ## a)





#define RTLLIB_DEBUG_WX(f, a...)     RTLLIB_DEBUG(RTLLIB_DL_WX, f, ## a)

#define RTLLIB_DEBUG_SCAN(f, a...)   RTLLIB_DEBUG(RTLLIB_DL_SCAN, f, ## a)

#define RTLLIB_DEBUG_SCAN(f, a...)   RTLLIB_DEBUG(RTLLIB_DL_SCAN, f, ## a)

#define RTLLIB_DEBUG_STATE(f, a...)  RTLLIB_DEBUG(RTLLIB_DL_STATE, f, ## a)

#define RTLLIB_DEBUG_STATE(f, a...)  RTLLIB_DEBUG(RTLLIB_DL_STATE, f, ## a)

#define RTLLIB_DEBUG_MGMT(f, a...)  RTLLIB_DEBUG(RTLLIB_DL_MGMT, f, ## a)

#define RTLLIB_DEBUG_MGMT(f, a...)  RTLLIB_DEBUG(RTLLIB_DL_MGMT, f, ## a)

drivers/staging/rtl8192e/rtllib_wx.c

+16 −17
Original line number Original line Diff line number Diff line
@@ -266,7 +266,7 @@ int rtllib_wx_get_scan(struct rtllib_device *ieee, 
	int i = 0;

	int i = 0;

	int err = 0;

	int err = 0;





	RTLLIB_DEBUG_WX("Getting scan\n");

	netdev_dbg(ieee->dev, "Getting scan\n");

	down(&ieee->wx_sem);

	down(&ieee->wx_sem);

	spin_lock_irqsave(&ieee->lock, flags);

	spin_lock_irqsave(&ieee->lock, flags);
@@ -293,7 +293,7 @@ int rtllib_wx_get_scan(struct rtllib_device *ieee, 
	wrqu->data.length = ev -  extra;

	wrqu->data.length = ev -  extra;

	wrqu->data.flags = 0;

	wrqu->data.flags = 0;





	RTLLIB_DEBUG_WX("exit: %d networks returned.\n", i);

	netdev_dbg(ieee->dev, "%s(): %d networks returned.\n", __func__, i);





	return err;

	return err;

}

}
@@ -311,7 +311,7 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee, 
	int i, key, key_provided, len;

	int i, key, key_provided, len;

	struct lib80211_crypt_data **crypt;

	struct lib80211_crypt_data **crypt;





	RTLLIB_DEBUG_WX("SET_ENCODE\n");

	netdev_dbg(ieee->dev, "%s()\n", __func__);





	key = erq->flags & IW_ENCODE_INDEX;

	key = erq->flags & IW_ENCODE_INDEX;

	if (key) {

	if (key) {
@@ -324,16 +324,16 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee, 
		key = ieee->crypt_info.tx_keyidx;

		key = ieee->crypt_info.tx_keyidx;

	}

	}





	RTLLIB_DEBUG_WX("Key: %d [%s]\n", key, key_provided ?

	netdev_dbg(ieee->dev, "Key: %d [%s]\n", key, key_provided ?

			   "provided" : "default");

			   "provided" : "default");

	crypt = &ieee->crypt_info.crypt[key];

	crypt = &ieee->crypt_info.crypt[key];

	if (erq->flags & IW_ENCODE_DISABLED) {

	if (erq->flags & IW_ENCODE_DISABLED) {

		if (key_provided && *crypt) {

		if (key_provided && *crypt) {

			RTLLIB_DEBUG_WX("Disabling encryption on key %d.\n",

			netdev_dbg(ieee->dev,

					   key);

				   "Disabling encryption on key %d.\n", key);

			lib80211_crypt_delayed_deinit(&ieee->crypt_info, crypt);

			lib80211_crypt_delayed_deinit(&ieee->crypt_info, crypt);

		} else

		} else

			RTLLIB_DEBUG_WX("Disabling encryption.\n");

			netdev_dbg(ieee->dev, "Disabling encryption.\n");





		/* Check all the keys to see if any are still configured,

		/* Check all the keys to see if any are still configured,

		 * and if no key index was provided, de-init them all

		 * and if no key index was provided, de-init them all
@@ -405,9 +405,9 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee, 
		if (len > erq->length)

		if (len > erq->length)

			memset(sec.keys[key] + erq->length, 0,

			memset(sec.keys[key] + erq->length, 0,

			       len - erq->length);

			       len - erq->length);

		RTLLIB_DEBUG_WX("Setting key %d to '%s' (%d:%d bytes)\n",

		netdev_dbg(ieee->dev, "Setting key %d to '%s' (%d:%d bytes)\n",

				   key, escape_essid(sec.keys[key], len),

			   key, escape_essid(sec.keys[key], len), erq->length,

				   erq->length, len);

			   len);

		sec.key_sizes[key] = len;

		sec.key_sizes[key] = len;

		(*crypt)->ops->set_key(sec.keys[key], len, NULL,

		(*crypt)->ops->set_key(sec.keys[key], len, NULL,

				       (*crypt)->priv);

				       (*crypt)->priv);
@@ -436,8 +436,8 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee, 




		/* No key data - just set the default TX key index */

		/* No key data - just set the default TX key index */

		if (key_provided) {

		if (key_provided) {

			RTLLIB_DEBUG_WX("Setting key %d to default Tx key.\n",

			netdev_dbg(ieee->dev,

					key);

				   "Setting key %d as default Tx key.\n", key);

			ieee->crypt_info.tx_keyidx = key;

			ieee->crypt_info.tx_keyidx = key;

			sec.active_key = key;

			sec.active_key = key;

			sec.flags |= SEC_ACTIVE_KEY;

			sec.flags |= SEC_ACTIVE_KEY;
@@ -449,7 +449,7 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee, 
			  WLAN_AUTH_SHARED_KEY;

			  WLAN_AUTH_SHARED_KEY;

	sec.auth_mode = ieee->open_wep ? WLAN_AUTH_OPEN : WLAN_AUTH_SHARED_KEY;

	sec.auth_mode = ieee->open_wep ? WLAN_AUTH_OPEN : WLAN_AUTH_SHARED_KEY;

	sec.flags |= SEC_AUTH_MODE;

	sec.flags |= SEC_AUTH_MODE;

	RTLLIB_DEBUG_WX("Auth: %s\n", sec.auth_mode == WLAN_AUTH_OPEN ?

	netdev_dbg(ieee->dev, "Auth: %s\n", sec.auth_mode == WLAN_AUTH_OPEN ?

			   "OPEN" : "SHARED KEY");

			   "OPEN" : "SHARED KEY");





	/* For now we just support WEP, so only set that security level...

	/* For now we just support WEP, so only set that security level...
@@ -485,7 +485,7 @@ int rtllib_wx_get_encode(struct rtllib_device *ieee, 
	int len, key;

	int len, key;

	struct lib80211_crypt_data *crypt;

	struct lib80211_crypt_data *crypt;





	RTLLIB_DEBUG_WX("GET_ENCODE\n");

	netdev_dbg(ieee->dev, "%s()\n", __func__);





	if (ieee->iw_mode == IW_MODE_MONITOR)

	if (ieee->iw_mode == IW_MODE_MONITOR)

		return -1;

		return -1;
@@ -592,8 +592,7 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee, 
		module = "rtllib_crypt_ccmp";

		module = "rtllib_crypt_ccmp";

		break;

		break;

	default:

	default:

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

		netdev_dbg(ieee->dev, "Unknown crypto alg %d\n", ext->alg);

				   dev->name, ext->alg);

		ret = -EINVAL;

		ret = -EINVAL;

		goto done;

		goto done;

	}

	}
@@ -673,7 +672,7 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee, 
	 if (ieee->reset_on_keychange &&

	 if (ieee->reset_on_keychange &&

	    ieee->iw_mode != IW_MODE_INFRA &&

	    ieee->iw_mode != IW_MODE_INFRA &&

	    ieee->reset_port && ieee->reset_port(dev)) {

	    ieee->reset_port && ieee->reset_port(dev)) {

		RTLLIB_DEBUG_WX("%s: reset_port failed\n", dev->name);

		netdev_dbg(ieee->dev, "Port reset failed\n");

		return -EINVAL;

		return -EINVAL;

	}

	}

	return ret;

	return ret;