userspace/tools: improve wrs_vlans

--Change parameter --pumask to --puntag; "mask" part is misleading, since full mask is not supported. --use "pmode" rather "pmode" --improve help message --support -1 for pprio to disable fix priority --support -1 for rprio to disable fix priority --change VLANS_PORTXX_UMASK_ALL and VLANS_PORTXX_UMASK_NONE into VLANS_PORTXX_UNTAG_ALL and VLANS_PORTXX_UNTAG_NONE Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

userspace/tools: improve wrs_vlans
--Change parameter --pumask to --puntag; "mask" part is misleading, since full mask is not supported. --use "pmode" rather "pmode" --improve help message --support -1 for pprio to disable fix priority --support -1 for rprio to disable fix priority --change VLANS_PORTXX_UMASK_ALL and VLANS_PORTXX_UMASK_NONE into VLANS_PORTXX_UNTAG_ALL and VLANS_PORTXX_UNTAG_NONE Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
01cd9334 · Adam Wujek · 6726a0d9 · 01cd9334 · 01cd9334
Commit 01cd9334 authored Sep 15, 2016 by Adam Wujek 💬
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 89 additions and 56 deletions

wrs_vlans.c userspace/tools/wrs_vlans.c +82 -51

wrs_vlans.h userspace/tools/wrs_vlans.h +7 -5

No files found.
--- a/userspace/tools/wrs_vlans.c
+++ b/userspace/tools/wrs_vlans.c
--- a/userspace/tools/wrs_vlans.h
+++ b/userspace/tools/wrs_vlans.h
@@ -48,7 +48,7 @@
 #define OPT_P_QMODE 11
 #define OPT_P_VID   12
 #define OPT_P_PRIO  13
-#define OPT_P_UMASK 14
+#define OPT_P_UNTAG 14
 #define OPT_P_LIST  15
 #define OPT_RTU_VID  20
 #define OPT_RTU_FID  21
@@ -61,18 +61,20 @@

 #define PORT_PRIO_MIN 0
 #define PORT_PRIO_MAX 7
+#define PORT_PRIO_DISABLE -1

 #define PORT_VID_MIN 0
-#define PORT_VID_MAX 4095
+#define PORT_VID_MAX 4094

 #define RTU_VID_MIN 0
-#define RTU_VID_MAX 4095
+#define RTU_VID_MAX 4094

 #define RTU_FID_MIN 0
-#define RTU_FID_MAX 4095
+#define RTU_FID_MAX 4094

 #define RTU_PRIO_MIN 0
 #define RTU_PRIO_MAX 7
+#define RTU_PRIO_DISABLE -1

 #define RTU_PMASK_MIN 0
 #define RTU_PMASK_MAX ((1 << NPORTS) - 1)
@@ -87,7 +89,7 @@ struct vlan_sets {
 struct s_port_vlans
 {
 	int  valid_mask;
-	char qmode;
+	char pmode;
 	char fix_prio;
 	char prio_val;
 	int  vid;