[PATCH] add option to dump unknown IEs with scan command

[PATCH] add option to dump unknown IEs with scan command

[Marcel Holtmann]

---
 scan.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/scan.c b/scan.c
index 48f803a..91e94ed 100644
--- a/scan.c
+++ b/scan.c
@@ -340,12 +340,13 @@ static int handle_scan_combined(struct nl80211_state *state,
 		NULL,
 		"scan",
 		"dump",
+		NULL,
 	};
 	static const __u32 cmds[] = {
 		NL80211_CMD_NEW_SCAN_RESULTS,
 		NL80211_CMD_SCAN_ABORTED,
 	};
-	int err;
+	int dump_argc, err;
 
 	trig_argv[0] = argv[0];
 	err = handle_cmd(state, II_NETDEV, ARRAY_SIZE(trig_argv), trig_argv);
@@ -382,7 +383,13 @@ static int handle_scan_combined(struct nl80211_state *state,
 		return 0;
 	}
 
+	if (argc == 3 && !strcmp(argv[2], "-u")) {
+		dump_argc = 4;
+		dump_argv[3] = "-u";
+	} else
+		dump_argc = 3;
+
 	dump_argv[0] = argv[0];
-	return handle_cmd(state, II_NETDEV, ARRAY_SIZE(dump_argv), dump_argv);
+	return handle_cmd(state, II_NETDEV, dump_argc, dump_argv);
 }
-TOPLEVEL(scan, NULL, 0, 0, CIB_NETDEV, handle_scan_combined);
+TOPLEVEL(scan, "[-u]", 0, 0, CIB_NETDEV, handle_scan_combined);
-- 
1.6.0.6

Re: [PATCH] add option to dump unknown IEs with scan command

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 58 bytes --]

I like this, thanks, applied and pushed out.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]