From: Mohammed Shafi Shajakhan <[email protected]>
Add support for new netlink attribute 'NL80211_STA_INFO_RX_DURATION'
This flag will be set when drivers can fill rx_duration (vendor
specific total air time(usecs) for data/management frames from the
connected client) via 'drv_sta_statistics' callback
Also make sta_info flags 'filled' as 64 bit to accommodate for new
per station stats. Extend 'PUT_SINFO' for supporting rx_duration
field and any new per sta information in future
Signed-off-by: Mohammed Shafi Shajakhan <[email protected]>
---
[v1]
1. Fixed typo for accommodate
2. changed the doc for rx_duration as 'vendor specific implementation'
include/net/cfg80211.h | 5 ++++-
include/uapi/linux/nl80211.h | 3 +++
net/wireless/nl80211.c | 3 ++-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 9bcaaf7..2db26a9 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1060,11 +1060,13 @@ struct cfg80211_tid_stats {
* @rx_beacon: number of beacons received from this peer
* @rx_beacon_signal_avg: signal strength average (in dBm) for beacons received
* from this peer
+ * @rx_duration: vendor specific total air time(usecs) for data/management
+ * frames from the connected client
* @pertid: per-TID statistics, see &struct cfg80211_tid_stats, using the last
* (IEEE80211_NUM_TIDS) index for MSDUs not encapsulated in QoS-MPDUs.
*/
struct station_info {
- u32 filled;
+ u64 filled;
u32 connected_time;
u32 inactive_time;
u64 rx_bytes;
@@ -1103,6 +1105,7 @@ struct station_info {
u32 expected_throughput;
u64 rx_beacon;
+ u64 rx_duration;
u8 rx_beacon_signal_avg;
struct cfg80211_tid_stats pertid[IEEE80211_NUM_TIDS + 1];
};
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 5b7b5eb..f64a854 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -2464,6 +2464,8 @@ enum nl80211_sta_bss_param {
* TID+1 and the special TID 16 (i.e. value 17) is used for non-QoS frames;
* each one of those is again nested with &enum nl80211_tid_stats
* attributes carrying the actual values.
+ * @NL80211_STA_INFO_RX_DURATION: vendor specific total air time(usecs) for
+ * data/management frames from the connected client
* @__NL80211_STA_INFO_AFTER_LAST: internal
* @NL80211_STA_INFO_MAX: highest possible station info attribute
*/
@@ -2500,6 +2502,7 @@ enum nl80211_sta_info {
NL80211_STA_INFO_BEACON_RX,
NL80211_STA_INFO_BEACON_SIGNAL_AVG,
NL80211_STA_INFO_TID_STATS,
+ NL80211_STA_INFO_RX_DURATION,
/* keep last */
__NL80211_STA_INFO_AFTER_LAST,
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index d4786f2..a81c016 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -3719,7 +3719,7 @@ static int nl80211_send_station(struct sk_buff *msg, u32 cmd, u32 portid,
goto nla_put_failure;
#define PUT_SINFO(attr, memb, type) do { \
- if (sinfo->filled & BIT(NL80211_STA_INFO_ ## attr) && \
+ if (sinfo->filled & (1ULL << NL80211_STA_INFO_ ## attr) && \
nla_put_ ## type(msg, NL80211_STA_INFO_ ## attr, \
sinfo->memb)) \
goto nla_put_failure; \
@@ -3745,6 +3745,7 @@ static int nl80211_send_station(struct sk_buff *msg, u32 cmd, u32 portid,
PUT_SINFO(LLID, llid, u16);
PUT_SINFO(PLID, plid, u16);
PUT_SINFO(PLINK_STATE, plink_state, u8);
+ PUT_SINFO(RX_DURATION, rx_duration, u64);
switch (rdev->wiphy.signal_type) {
case CFG80211_SIGNAL_TYPE_MBM:
--
1.7.9.5
On Mon, 2016-03-07 at 16:33 +0530, Mohammed Shafi Shajakhan wrote:
> From: Mohammed Shafi Shajakhan <[email protected]>
>
> Add support for new netlink attribute 'NL80211_STA_INFO_RX_DURATION'
> This flag will be set when drivers can fill rx_duration (vendor
> specific total air time(usecs) for data/management frames from the
> connected client) via 'drv_sta_statistics' callback
>
> Also make sta_info flags 'filled' as 64 bit to accommodate for new
> per station stats. Extend 'PUT_SINFO' for supporting rx_duration
> field and any new per sta information in future
>
> Signed-off-by: Mohammed Shafi Shajakhan <[email protected]>
> ---
> [v1]
> 1. Fixed typo for accommodate
> 2. changed the doc for rx_duration as 'vendor specific
> implementation'
No, I want it defined for all cases, not left undefined.
johannes
On Wed, Mar 09, 2016 at 12:09:15PM +0530, Mohammed Shafi Shajakhan wrote:
> Hi Johannes,
>
> On Tue, Mar 08, 2016 at 05:52:23PM +0100, Johannes Berg wrote:
> > On Mon, 2016-03-07 at 16:33 +0530, Mohammed Shafi Shajakhan wrote:
> > > From: Mohammed Shafi Shajakhan <[email protected]>
> > >
> > > Add support for new netlink attribute 'NL80211_STA_INFO_RX_DURATION'
> > > This flag will be set when drivers can fill rx_duration (vendor
> > > specific total air time(usecs) for data/management frames from the
> > > connected client) via 'drv_sta_statistics' callback
> > >
> > > Also make sta_info flags 'filled' as 64 bit to accommodate for new
> > > per station stats. Extend 'PUT_SINFO' for supporting rx_duration
> > > field and any new per sta information in future
> > >
> > > Signed-off-by: Mohammed Shafi Shajakhan <[email protected]>
> > > ---
> > > [v1]?
> > > 1. Fixed typo for accommodate
> > > 2. changed the doc for rx_duration as 'vendor specific
> > > implementation'
> >
> > No, I want it defined for all cases, not left undefined.
>
> [shafi] Let me know if the below documentation is fine with you please
>
> "@rx_duration: approximate total air time(usecs) for all data/management
> frames from the connected client "
[shafi] correction (made it all frames (not only data/management frames)
"@rx_duration: approximate total air time(usecs) for all frames
from the connected client "
>
> thanks for reviewing this and Jouni for his initial suggestions.
>
> regards,
> shafi
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Johannes,
On Tue, Mar 08, 2016 at 05:52:23PM +0100, Johannes Berg wrote:
> On Mon, 2016-03-07 at 16:33 +0530, Mohammed Shafi Shajakhan wrote:
> > From: Mohammed Shafi Shajakhan <[email protected]>
> >
> > Add support for new netlink attribute 'NL80211_STA_INFO_RX_DURATION'
> > This flag will be set when drivers can fill rx_duration (vendor
> > specific total air time(usecs) for data/management frames from the
> > connected client) via 'drv_sta_statistics' callback
> >
> > Also make sta_info flags 'filled' as 64 bit to accommodate for new
> > per station stats. Extend 'PUT_SINFO' for supporting rx_duration
> > field and any new per sta information in future
> >
> > Signed-off-by: Mohammed Shafi Shajakhan <[email protected]>
> > ---
> > [v1]?
> > 1. Fixed typo for accommodate
> > 2. changed the doc for rx_duration as 'vendor specific
> > implementation'
>
> No, I want it defined for all cases, not left undefined.
[shafi] Let me know if the below documentation is fine with you please
"@rx_duration: approximate total air time(usecs) for all data/management
frames from the connected client "
thanks for reviewing this and Jouni for his initial suggestions.
regards,
shafi