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

Commit c5df9f31 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Indicate support for reporting rx FCS error rate"

parents 86768220 05be0e00

include/net/cfg80211.h

+10 −0
Original line number Diff line number Diff line
@@ -40,6 +40,9 @@ 
/* Indicate backport support for external authentication in AP mode */

#define CFG80211_EXTERNAL_AUTH_AP_SUPPORT 1



/* Indicate support for reporting rx FCS in cfg80211 */

#define CFG80211_RX_FCS_ERROR_REPORTING_SUPPORT 1



/**

 * DOC: Introduction

 *
@@ -1318,6 +1321,10 @@ struct cfg80211_tid_stats { 
 * @ack_signal: signal strength (in dBm) of the last ACK frame.

 * @avg_ack_signal: average rssi value of ack packet for the no of msdu's has

 *	been sent.

 * @rx_mpdu_count: number of MPDUs received from this station

 * @fcs_err_count: number of packets (MPDUs) received from this station with

 *	an FCS error. This counter should be incremented only when TA of the

 *	received packet with an FCS error matches the peer MAC address.

 */

struct station_info {

	u64 filled;
@@ -1364,6 +1371,9 @@ struct station_info { 
	struct cfg80211_tid_stats *pertid;

	s8 ack_signal;

	s8 avg_ack_signal;



	u32 rx_mpdu_count;

	u32 fcs_err_count;

};



#if IS_ENABLED(CONFIG_CFG80211)

include/uapi/linux/nl80211.h

+8 −0
Original line number Diff line number Diff line
@@ -3099,6 +3099,12 @@ enum nl80211_sta_bss_param { 
 * @NL80211_STA_INFO_ACK_SIGNAL: signal strength of the last ACK frame(u8, dBm)

 * @NL80211_STA_INFO_DATA_ACK_SIGNAL_AVG: avg signal strength of (data)

 *	ACK frame (s8, dBm)

 * @NL80211_STA_INFO_RX_MPDUS: total number of received packets (MPDUs)

 *	(u32, from this station)

 * @NL80211_STA_INFO_FCS_ERROR_COUNT: total number of packets (MPDUs) received

 *	with an FCS error (u32, from this station). This count may not include

 *	some packets with an FCS error due to TA corruption. Hence this counter

 *	might not be fully accurate.

 * @__NL80211_STA_INFO_AFTER_LAST: internal

 * @NL80211_STA_INFO_MAX: highest possible station info attribute

 */
@@ -3139,6 +3145,8 @@ enum nl80211_sta_info { 
	NL80211_STA_INFO_PAD,

	NL80211_STA_INFO_ACK_SIGNAL,

	NL80211_STA_INFO_DATA_ACK_SIGNAL_AVG,

	NL80211_STA_INFO_RX_MPDUS,

	NL80211_STA_INFO_FCS_ERROR_COUNT,



	/* keep last */

	__NL80211_STA_INFO_AFTER_LAST,

net/wireless/nl80211.c

+2 −0
Original line number Diff line number Diff line
@@ -4729,6 +4729,8 @@ static int nl80211_send_station(struct sk_buff *msg, u32 cmd, u32 portid, 
	PUT_SINFO_U64(RX_DROP_MISC, rx_dropped_misc);

	PUT_SINFO_U64(BEACON_RX, rx_beacon);

	PUT_SINFO(BEACON_SIGNAL_AVG, rx_beacon_signal_avg, u8);

	PUT_SINFO(RX_MPDUS, rx_mpdu_count, u32);

	PUT_SINFO(FCS_ERROR_COUNT, fcs_err_count, u32);

	PUT_SINFO(ACK_SIGNAL, ack_signal, u8);

	if (wiphy_ext_feature_isset(&rdev->wiphy,

				    NL80211_EXT_FEATURE_DATA_ACK_SIGNAL_SUPPORT))