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

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

staging: rtl8192e: Remove RTLLIB_DEBUG_SCAN() 



Use netdev_dbg() instead, remove duplicated logs.

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

drivers/staging/rtl8192e/rtllib.h

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

#define RTLLIB_DEBUG_INFO(f, a...)   RTLLIB_DEBUG(RTLLIB_DL_INFO, 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_MGMT(f, a...)  RTLLIB_DEBUG(RTLLIB_DL_MGMT, f, ## a)

#define RTLLIB_DEBUG_FRAG(f, a...)  RTLLIB_DEBUG(RTLLIB_DL_FRAG, f, ## a)

drivers/staging/rtl8192e/rtllib_rx.c

+47 −54
Original line number Diff line number Diff line
@@ -2130,7 +2130,7 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, 
			break;



		case MFIE_TYPE_HT_CAP:

			RTLLIB_DEBUG_SCAN("MFIE_TYPE_HT_CAP: %d bytes\n",

			netdev_dbg(ieee->dev, "MFIE_TYPE_HT_CAP: %d bytes\n",

				   info_element->len);

			tmp_htcap_len = min_t(u8, info_element->len, MAX_IE_LEN);

			if (tmp_htcap_len != 0) {
@@ -2157,7 +2157,7 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, 




		case MFIE_TYPE_HT_INFO:

			RTLLIB_DEBUG_SCAN("MFIE_TYPE_HT_INFO: %d bytes\n",

			netdev_dbg(ieee->dev, "MFIE_TYPE_HT_INFO: %d bytes\n",

				   info_element->len);

			tmp_htinfo_len = min_t(u8, info_element->len, MAX_IE_LEN);

			if (tmp_htinfo_len) {
@@ -2173,7 +2173,7 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, 
			break;



		case MFIE_TYPE_AIRONET:

			RTLLIB_DEBUG_SCAN("MFIE_TYPE_AIRONET: %d bytes\n",

			netdev_dbg(ieee->dev, "MFIE_TYPE_AIRONET: %d bytes\n",

				   info_element->len);

			if (info_element->len > IE_CISCO_FLAG_POSITION) {

				network->bWithAironetIE = true;
@@ -2196,7 +2196,7 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, 
			break;



		case MFIE_TYPE_COUNTRY:

			RTLLIB_DEBUG_SCAN("MFIE_TYPE_COUNTRY: %d bytes\n",

			netdev_dbg(ieee->dev, "MFIE_TYPE_COUNTRY: %d bytes\n",

				   info_element->len);

			rtllib_extract_country_ie(ieee, info_element, network,

						  network->bssid);
@@ -2304,9 +2304,8 @@ static inline int rtllib_network_init( 
	}



	if (network->mode == 0) {

		RTLLIB_DEBUG_SCAN("Filtered out '%s (%pM)' network.\n",

				     escape_essid(network->ssid,

						  network->ssid_len),

		netdev_dbg(ieee->dev, "Filtered out '%s (%pM)' network.\n",

			   escape_essid(network->ssid, network->ssid_len),

			   network->bssid);

		return 1;

	}
@@ -2505,7 +2504,7 @@ static inline void rtllib_process_probe_response( 
	if (!network)

		return;



	RTLLIB_DEBUG_SCAN(

	netdev_dbg(ieee->dev,

		   "'%s' ( %pM ): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n",

		   escape_essid(info_element->data, info_element->len),

		   beacon->header.addr3,
@@ -2527,11 +2526,10 @@ static inline void rtllib_process_probe_response( 
		   (le16_to_cpu(beacon->capability) & (1<<0x0)) ? '1' : '0');



	if (rtllib_network_init(ieee, beacon, network, stats)) {

		RTLLIB_DEBUG_SCAN("Dropped '%s' ( %pM) via %s.\n",

				  escape_essid(info_element->data,

				  info_element->len), beacon->header.addr3,

				  is_beacon(frame_ctl) ? "BEACON" :

							 "PROBE RESPONSE");

		netdev_dbg(ieee->dev, "Dropped '%s' ( %pM) via %s.\n",

			   escape_essid(info_element->data, info_element->len),

			   beacon->header.addr3,

			   is_beacon(frame_ctl) ? "BEACON" : "PROBE RESPONSE");

		goto free_network;

	}
@@ -2594,9 +2592,9 @@ static inline void rtllib_process_probe_response( 
			/* If there are no more slots, expire the oldest */

			list_del(&oldest->list);

			target = oldest;

			RTLLIB_DEBUG_SCAN("Expired '%s' ( %pM) from network list.\n",

					     escape_essid(target->ssid,

							  target->ssid_len),

			netdev_dbg(ieee->dev,

				   "Expired '%s' ( %pM) from network list.\n",

				   escape_essid(target->ssid, target->ssid_len),

				   target->bssid);

		} else {

			/* Otherwise just pull from the free list */
@@ -2605,22 +2603,20 @@ static inline void rtllib_process_probe_response( 
			list_del(ieee->network_free_list.next);

		}



		netdev_dbg(ieee->dev, "Adding '%s' ( %pM) via %s.\n",

			   escape_essid(network->ssid, network->ssid_len),

			   network->bssid,

			   is_beacon(frame_ctl) ? "BEACON" : "PROBE RESPONSE");



		RTLLIB_DEBUG_SCAN("Adding '%s' ( %pM) via %s.\n",

				  escape_essid(network->ssid,

				  network->ssid_len), network->bssid,

				  is_beacon(frame_ctl) ? "BEACON" :

							 "PROBE RESPONSE");

		memcpy(target, network, sizeof(*target));

		list_add_tail(&target->list, &ieee->network_list);

		if (ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE)

			rtllib_softmac_new_net(ieee, network);

	} else {

		RTLLIB_DEBUG_SCAN("Updating '%s' ( %pM) via %s.\n",

		netdev_dbg(ieee->dev, "Updating '%s' ( %pM) via %s.\n",

			   escape_essid(target->ssid, target->ssid_len),

			   target->bssid,

				  is_beacon(frame_ctl) ? "BEACON" :

							 "PROBE RESPONSE");

			   is_beacon(frame_ctl) ? "BEACON" : "PROBE RESPONSE");



		/* we have an entry and we are going to update it. But this

		 *  entry may be already expired. In this case we do the same
@@ -2670,7 +2666,6 @@ void rtllib_rx_mgt(struct rtllib_device *ieee, 
	case RTLLIB_STYPE_BEACON:

		RTLLIB_DEBUG_MGMT("received BEACON (%d)\n",

				  WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl)));

		RTLLIB_DEBUG_SCAN("Beacon\n");

		rtllib_process_probe_response(

				ieee, (struct rtllib_probe_response *)header,

				stats);
@@ -2685,7 +2680,6 @@ void rtllib_rx_mgt(struct rtllib_device *ieee, 
	case RTLLIB_STYPE_PROBE_RESP:

		RTLLIB_DEBUG_MGMT("received PROBE RESPONSE (%d)\n",

			WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl)));

		RTLLIB_DEBUG_SCAN("Probe response\n");

		rtllib_process_probe_response(ieee,

			      (struct rtllib_probe_response *)header, stats);

		break;
@@ -2693,7 +2687,6 @@ void rtllib_rx_mgt(struct rtllib_device *ieee, 
		RTLLIB_DEBUG_MGMT("received PROBE RESQUEST (%d)\n",

				  WLAN_FC_GET_STYPE(

					  le16_to_cpu(header->frame_ctl)));

		RTLLIB_DEBUG_SCAN("Probe request\n");

		if ((ieee->softmac_features & IEEE_SOFTMAC_PROBERS) &&

		    ((ieee->iw_mode == IW_MODE_ADHOC ||

		    ieee->iw_mode == IW_MODE_MASTER) &&

drivers/staging/rtl8192e/rtllib_wx.c

+7 −5
Original line number Diff line number Diff line
@@ -281,11 +281,13 @@ int rtllib_wx_get_scan(struct rtllib_device *ieee, 
			ev = rtl819x_translate_scan(ieee, ev, stop, network,

						    info);

		else

			RTLLIB_DEBUG_SCAN("Not showing network '%s ( %pM)' due to age (%lums).\n",

			netdev_dbg(ieee->dev,

				   "Network '%s ( %pM)' hidden due to age (%lums).\n",

				   escape_essid(network->ssid,

						network->ssid_len),

				   network->bssid,

				(jiffies - network->last_scanned) / (HZ / 100));

				   (jiffies - network->last_scanned) /

				   (HZ / 100));

	}



	spin_unlock_irqrestore(&ieee->lock, flags);