DFS: Add more parameters to radar events

Signed-hostap: Janusz Dziedzic <janusz.dziedzic@tieto.com>

diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index 37e27ba5108066795a6ebcbba4e26be07c0c8ff9..03c8b75c2428c2349718fd36bc0440a1032f7676 100644 (file)
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -3959,6 +3959,11 @@ union wpa_event_data {
         */
        struct dfs_event {
                int freq;
+               int ht_enabled;
+               int chan_offset;
+               enum chan_width chan_width;
+               int cf1;
+               int cf2;
        } dfs_event;
 
        /**

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index 8decec5a09def8415bd9190730bd26d3994ae0a7..8688ea1fafcd67ba77ec76159459d21616976487 100644 (file)
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -2498,6 +2498,8 @@ static void nl80211_connect_failed_event(struct wpa_driver_nl80211_data *drv,
 }
 
 
+static enum chan_width convert2width(int width);
+
 static void nl80211_radar_event(struct wpa_driver_nl80211_data *drv,
                                struct nlattr **tb)
 {
@@ -2511,8 +2513,37 @@ static void nl80211_radar_event(struct wpa_driver_nl80211_data *drv,
        data.dfs_event.freq = nla_get_u16(tb[NL80211_ATTR_WIPHY_FREQ]);
        event_type = nla_get_u8(tb[NL80211_ATTR_RADAR_EVENT]);
 
-       wpa_printf(MSG_DEBUG, "nl80211: DFS event on freq %d MHz",
-                  data.dfs_event.freq);
+       /* Check HT params */
+       if (tb[NL80211_ATTR_WIPHY_CHANNEL_TYPE]) {
+               data.dfs_event.ht_enabled = 1;
+               data.dfs_event.chan_offset = 0;
+
+               switch (nla_get_u32(tb[NL80211_ATTR_WIPHY_CHANNEL_TYPE])) {
+               case NL80211_CHAN_NO_HT:
+                       data.dfs_event.ht_enabled = 0;
+                       break;
+               case NL80211_CHAN_HT20:
+                       break;
+               case NL80211_CHAN_HT40PLUS:
+                       data.dfs_event.chan_offset = 1;
+                       break;
+               case NL80211_CHAN_HT40MINUS:
+                       data.dfs_event.chan_offset = -1;
+                       break;
+               }
+       }
+
+       /* Get VHT params */
+       data.dfs_event.chan_width =
+               convert2width(nla_get_u32(tb[NL80211_ATTR_CHANNEL_WIDTH]));
+       data.dfs_event.cf1 = nla_get_u32(tb[NL80211_ATTR_CENTER_FREQ1]);
+       if (tb[NL80211_ATTR_CENTER_FREQ2])
+               data.dfs_event.cf2 = nla_get_u32(tb[NL80211_ATTR_CENTER_FREQ2]);
+
+       wpa_printf(MSG_DEBUG, "nl80211: DFS event on freq %d MHz, ht: %d, offset: %d, width: %d, cf1: %dMHz, cf2: %dMHz",
+                  data.dfs_event.freq, data.dfs_event.ht_enabled,
+                  data.dfs_event.chan_offset, data.dfs_event.chan_width,
+                  data.dfs_event.cf1, data.dfs_event.cf2);
 
        switch (event_type) {
        case NL80211_RADAR_DETECTED: