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

Commit dd3b8921 authored by Vladimir Kondratiev's avatar Vladimir Kondratiev Committed by Ian Maund
Browse files

wil6210: improve mgmt frame handling 



Check event length;
hex dump both Rx and Tx frames

Change-Id: Ic93960905fc7e803817c0bb875d0eb8183e814eb
Signed-off-by: default avatarVladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
Git-commit: 90d89e9aaa9923cd44bd5bf8a26abb7834581ba6
Git-repo: https://github.com/kvalo/ath.git


Signed-off-by: default avatarHamad Kadmany <hkadmany@codeaurora.org>
parent 41056d69

drivers/net/wireless/ath/wil6210/wmi.c

+44 −10
Original line number Original line Diff line number Diff line
@@ -312,22 +312,44 @@ static void wmi_evt_rx_mgmt(struct wil6210_priv *wil, int id, void *d, int len) 
	struct wiphy *wiphy = wil_to_wiphy(wil);

	struct wiphy *wiphy = wil_to_wiphy(wil);

	struct ieee80211_mgmt *rx_mgmt_frame =

	struct ieee80211_mgmt *rx_mgmt_frame =

			(struct ieee80211_mgmt *)data->payload;

			(struct ieee80211_mgmt *)data->payload;

	int ch_no = data->info.channel+1;

	int flen = len - offsetof(struct wmi_rx_mgmt_packet_event, payload);

	u32 freq = ieee80211_channel_to_frequency(ch_no,

	int ch_no;

			IEEE80211_BAND_60GHZ);

	u32 freq;

	struct ieee80211_channel *channel = ieee80211_get_channel(wiphy, freq);

	struct ieee80211_channel *channel;

	s32 signal = data->info.sqi;

	s32 signal;

	__le16 fc = rx_mgmt_frame->frame_control;

	__le16 fc;

	u32 d_len = le32_to_cpu(data->info.len);

	u32 d_len;

	u16 d_status = le16_to_cpu(data->info.status);

	u16 d_status;





	wil_dbg_wmi(wil, "MGMT: channel %d MCS %d SNR %d SQI %d%%\n",

	if (flen < 0) {

		wil_err(wil, "MGMT Rx: short event, len %d\n", len);

		return;

	}



	d_len = le32_to_cpu(data->info.len);

	if (d_len != flen) {

		wil_err(wil,

			"MGMT Rx: length mismatch, d_len %d should be %d\n",

			d_len, flen);

		return;

	}



	ch_no = data->info.channel + 1;

	freq = ieee80211_channel_to_frequency(ch_no, IEEE80211_BAND_60GHZ);

	channel = ieee80211_get_channel(wiphy, freq);

	signal = data->info.sqi;

	d_status = le16_to_cpu(data->info.status);

	fc = rx_mgmt_frame->frame_control;



	wil_dbg_wmi(wil, "MGMT Rx: channel %d MCS %d SNR %d SQI %d%%\n",

		    data->info.channel, data->info.mcs, data->info.snr,

		    data->info.channel, data->info.mcs, data->info.snr,

		    data->info.sqi);

		    data->info.sqi);

	wil_dbg_wmi(wil, "status 0x%04x len %d fc 0x%04x\n", d_status, d_len,

	wil_dbg_wmi(wil, "status 0x%04x len %d fc 0x%04x\n", d_status, d_len,

		    le16_to_cpu(fc));

		    le16_to_cpu(fc));

	wil_dbg_wmi(wil, "qid %d mid %d cid %d\n",

	wil_dbg_wmi(wil, "qid %d mid %d cid %d\n",

		    data->info.qid, data->info.mid, data->info.cid);

		    data->info.qid, data->info.mid, data->info.cid);

	wil_hex_dump_wmi("MGMT Rx ", DUMP_PREFIX_OFFSET, 16, 1, rx_mgmt_frame,

			 d_len, true);





	if (!channel) {

	if (!channel) {

		wil_err(wil, "Frame on unsupported channel\n");

		wil_err(wil, "Frame on unsupported channel\n");
@@ -363,6 +385,17 @@ static void wmi_evt_rx_mgmt(struct wil6210_priv *wil, int id, void *d, int len) 
	}

	}

}

}





static void wmi_evt_tx_mgmt(struct wil6210_priv *wil, int id, void *d, int len)

{

	struct wmi_tx_mgmt_packet_event *data = d;

	struct ieee80211_mgmt *mgmt_frame =

			(struct ieee80211_mgmt *)data->payload;

	int flen = len - offsetof(struct wmi_tx_mgmt_packet_event, payload);



	wil_hex_dump_wmi("MGMT Tx ", DUMP_PREFIX_OFFSET, 16, 1, mgmt_frame,

			 flen, true);

}



static void wmi_evt_scan_complete(struct wil6210_priv *wil, int id,

static void wmi_evt_scan_complete(struct wil6210_priv *wil, int id,

				  void *d, int len)

				  void *d, int len)

{

{
@@ -660,6 +693,7 @@ static const struct { 
	{WMI_READY_EVENTID,		wmi_evt_ready},

	{WMI_READY_EVENTID,		wmi_evt_ready},

	{WMI_FW_READY_EVENTID,		wmi_evt_fw_ready},

	{WMI_FW_READY_EVENTID,		wmi_evt_fw_ready},

	{WMI_RX_MGMT_PACKET_EVENTID,	wmi_evt_rx_mgmt},

	{WMI_RX_MGMT_PACKET_EVENTID,	wmi_evt_rx_mgmt},

	{WMI_TX_MGMT_PACKET_EVENTID,		wmi_evt_tx_mgmt},

	{WMI_SCAN_COMPLETE_EVENTID,	wmi_evt_scan_complete},

	{WMI_SCAN_COMPLETE_EVENTID,	wmi_evt_scan_complete},

	{WMI_CONNECT_EVENTID,		wmi_evt_connect},

	{WMI_CONNECT_EVENTID,		wmi_evt_connect},

	{WMI_DISCONNECT_EVENTID,	wmi_evt_disconnect},

	{WMI_DISCONNECT_EVENTID,	wmi_evt_disconnect},