linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Benjamin Berg <benjamin@sipsolutions.net>
To: Johannes Berg <johannes@sipsolutions.net>
Cc: linux-wireless@vger.kernel.org, sw@simonwunderlich.de,
	Benjamin Berg <benjamin.berg@open-mesh.com>
Subject: [PATCH 8/8] Print frequency of radar events.
Date: Mon,  7 Nov 2016 15:59:43 +0100	[thread overview]
Message-ID: <20161107145943.16761-9-benjamin@sipsolutions.net> (raw)
In-Reply-To: <20161107145943.16761-1-benjamin@sipsolutions.net>

From: Benjamin Berg <benjamin.berg@open-mesh.com>

Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Benjamin Berg <benjamin.berg@open-mesh.com>
---
 event.c | 48 +++++++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/event.c b/event.c
index 446debb..8014d73 100644
--- a/event.c
+++ b/event.c
@@ -584,30 +584,32 @@ static int print_event(struct nl_msg *msg, void *arg)
 				   nla_data(tb[NL80211_ATTR_VENDOR_DATA]),
 				   nla_len(tb[NL80211_ATTR_VENDOR_DATA]));
 		break;
-	case NL80211_CMD_RADAR_DETECT:
-		printf("radar event ");
-		if (tb[NL80211_ATTR_RADAR_EVENT]) {
-			switch (nla_get_u32(tb[NL80211_ATTR_RADAR_EVENT])) {
-				case NL80211_RADAR_DETECTED:
-					printf("(radar detected)");
-					break;
-				case NL80211_RADAR_CAC_FINISHED:
-					printf("(cac finished)");
-					break;
-				case NL80211_RADAR_CAC_ABORTED:
-					printf("(cac aborted)");
-					break;
-				case NL80211_RADAR_NOP_FINISHED:
-					printf("(nop finished)");
-					break;
-				default:
-					printf("(unknown)");
-					break;
-			};
-		} else {
-			printf("(unknown)");
+	case NL80211_CMD_RADAR_DETECT: {
+			enum nl80211_radar_event event_type;
+			uint32_t freq;
+
+			if (!tb[NL80211_ATTR_RADAR_EVENT] || !tb[NL80211_ATTR_WIPHY_FREQ])
+				printf("BAD radar event");
+			freq = nla_get_u32(tb[NL80211_ATTR_WIPHY_FREQ]);
+			event_type = nla_get_u32(tb[NL80211_ATTR_RADAR_EVENT]);
+
+			switch (event_type) {
+			case NL80211_RADAR_DETECTED:
+				printf("%d MHz: radar detected\n", freq);
+				break;
+			case NL80211_RADAR_CAC_FINISHED:
+				printf("%d MHz: CAC finished\n", freq);
+				break;
+			case NL80211_RADAR_CAC_ABORTED:
+				printf("%d MHz: CAC was aborted\n", freq);
+				break;
+			case NL80211_RADAR_NOP_FINISHED:
+				printf("%d MHz: NOP finished\n", freq);
+				break;
+			default:
+				printf("%d MHz: unknown radar event\n", freq);
+			}
 		}
-		printf("\n");
 		break;
 	case NL80211_CMD_DEL_WIPHY:
 		printf("delete wiphy\n");
-- 
2.10.2

  parent reply	other threads:[~2016-11-07 14:59 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-07 14:59 [PATCH 0/8] iw: Add common chandef parser and new DFS related commands Benjamin Berg
2016-11-07 14:59 ` [PATCH 1/8] util: Add generic frequency/channel command line handler Benjamin Berg
2016-11-07 14:59 ` [PATCH 2/8] phy: Use common freqchan helper for setting the operating channel Benjamin Berg
2016-11-07 14:59 ` [PATCH 3/8] ibss: Use common freqchan helper for joining an ibss Benjamin Berg
2016-11-07 14:59 ` [PATCH 4/8] mesh: Use common freqchan helper for joining a mesh Benjamin Berg
2016-11-07 14:59 ` [PATCH 5/8] Add cac command to allow clearing channels Benjamin Berg
2016-11-07 14:59 ` [PATCH 6/8] Add commands to send CSA Benjamin Berg
2016-11-07 14:59 ` [PATCH 7/8] Add flag for DFS handling in IBSS Benjamin Berg
2016-11-07 14:59 ` Benjamin Berg [this message]
2016-11-17 17:21   ` [PATCH 8/8] Print frequency of radar events Henrik Eriksson
2016-11-17 17:25     ` Benjamin Berg
2016-11-16 12:41 ` [PATCH 0/8] iw: Add common chandef parser and new DFS related commands Johannes Berg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20161107145943.16761-9-benjamin@sipsolutions.net \
    --to=benjamin@sipsolutions.net \
    --cc=benjamin.berg@open-mesh.com \
    --cc=johannes@sipsolutions.net \
    --cc=linux-wireless@vger.kernel.org \
    --cc=sw@simonwunderlich.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).