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

Commit c6e57b38 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

mac80211: shorten the IBSS debug messages 



When tracing is enabled, all the debug messages are recorded and must
not exceed MAX_MSG_LEN (100) columns. Longer debug messages grant the
user with:

WARNING: CPU: 3 PID: 32642 at /tmp/wifi-core-20180806094828/src/iwlwifi-stack-dev/net/mac80211/./trace_msg.h:32 trace_event_raw_event_mac80211_msg_event+0xab/0xc0 [mac80211]
Workqueue: phy1 ieee80211_iface_work [mac80211]
 RIP: 0010:trace_event_raw_event_mac80211_msg_event+0xab/0xc0 [mac80211]
 Call Trace:
  __sdata_dbg+0xbd/0x120 [mac80211]
  ieee80211_ibss_rx_queued_mgmt+0x15f/0x510 [mac80211]
  ieee80211_iface_work+0x21d/0x320 [mac80211]

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 6c18b27d

net/mac80211/ibss.c

+11 −11
Original line number Diff line number Diff line
@@ -947,8 +947,8 @@ static void ieee80211_rx_mgmt_deauth_ibss(struct ieee80211_sub_if_data *sdata, 
	if (len < IEEE80211_DEAUTH_FRAME_LEN)

		return;



	ibss_dbg(sdata, "RX DeAuth SA=%pM DA=%pM BSSID=%pM (reason: %d)\n",

		 mgmt->sa, mgmt->da, mgmt->bssid, reason);

	ibss_dbg(sdata, "RX DeAuth SA=%pM DA=%pM\n", mgmt->sa, mgmt->da);

	ibss_dbg(sdata, "\tBSSID=%pM (reason: %d)\n", mgmt->bssid, reason);

	sta_info_destroy_addr(sdata, mgmt->sa);

}
@@ -966,9 +966,9 @@ static void ieee80211_rx_mgmt_auth_ibss(struct ieee80211_sub_if_data *sdata, 
	auth_alg = le16_to_cpu(mgmt->u.auth.auth_alg);

	auth_transaction = le16_to_cpu(mgmt->u.auth.auth_transaction);



	ibss_dbg(sdata,

		 "RX Auth SA=%pM DA=%pM BSSID=%pM (auth_transaction=%d)\n",

		 mgmt->sa, mgmt->da, mgmt->bssid, auth_transaction);

	ibss_dbg(sdata, "RX Auth SA=%pM DA=%pM\n", mgmt->sa, mgmt->da);

	ibss_dbg(sdata, "\tBSSID=%pM (auth_transaction=%d)\n",

		 mgmt->bssid, auth_transaction);



	if (auth_alg != WLAN_AUTH_OPEN || auth_transaction != 1)

		return;
@@ -1175,10 +1175,10 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, 
		rx_timestamp = drv_get_tsf(local, sdata);

	}



	ibss_dbg(sdata,

		 "RX beacon SA=%pM BSSID=%pM TSF=0x%llx BCN=0x%llx diff=%lld @%lu\n",

	ibss_dbg(sdata, "RX beacon SA=%pM BSSID=%pM TSF=0x%llx\n",

		 mgmt->sa, mgmt->bssid,

		 (unsigned long long)rx_timestamp,

		 (unsigned long long)rx_timestamp);

	ibss_dbg(sdata, "\tBCN=0x%llx diff=%lld @%lu\n",

		 (unsigned long long)beacon_timestamp,

		 (unsigned long long)(rx_timestamp - beacon_timestamp),

		 jiffies);
@@ -1537,9 +1537,9 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata, 


	tx_last_beacon = drv_tx_last_beacon(local);



	ibss_dbg(sdata,

		 "RX ProbeReq SA=%pM DA=%pM BSSID=%pM (tx_last_beacon=%d)\n",

		 mgmt->sa, mgmt->da, mgmt->bssid, tx_last_beacon);

	ibss_dbg(sdata, "RX ProbeReq SA=%pM DA=%pM\n", mgmt->sa, mgmt->da);

	ibss_dbg(sdata, "\tBSSID=%pM (tx_last_beacon=%d)\n",

		 mgmt->bssid, tx_last_beacon);



	if (!tx_last_beacon && is_multicast_ether_addr(mgmt->da))

		return;