Skip to content

W
White Rabbit Switch - Software
Commit 01cd9334 authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

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's avatarAdam Wujek <adam.wujek@cern.ch>
parent 6726a0d9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 56 deletions
userspace/tools/wrs_vlans.c
View file @ 01cd9334
This diff is collapsed.
userspace/tools/wrs_vlans.h
View file @ 01cd9334
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
#define OPT_P_QMODE 11 #define OPT_P_QMODE 11
#define OPT_P_VID 12 #define OPT_P_VID 12
#define OPT_P_PRIO 13 #define OPT_P_PRIO 13
#define OPT_P_UMASK 14 #define OPT_P_UNTAG 14
#define OPT_P_LIST 15 #define OPT_P_LIST 15
#define OPT_RTU_VID 20 #define OPT_RTU_VID 20
#define OPT_RTU_FID 21 #define OPT_RTU_FID 21
...@@ -61,18 +61,20 @@ ...@@ -61,18 +61,20 @@
#define PORT_PRIO_MIN 0 #define PORT_PRIO_MIN 0
#define PORT_PRIO_MAX 7 #define PORT_PRIO_MAX 7
#define PORT_PRIO_DISABLE -1
#define PORT_VID_MIN 0 #define PORT_VID_MIN 0
#define PORT_VID_MAX 4095 #define PORT_VID_MAX 4094
#define RTU_VID_MIN 0 #define RTU_VID_MIN 0
#define RTU_VID_MAX 4095 #define RTU_VID_MAX 4094
#define RTU_FID_MIN 0 #define RTU_FID_MIN 0
#define RTU_FID_MAX 4095 #define RTU_FID_MAX 4094
#define RTU_PRIO_MIN 0 #define RTU_PRIO_MIN 0
#define RTU_PRIO_MAX 7 #define RTU_PRIO_MAX 7
#define RTU_PRIO_DISABLE -1
#define RTU_PMASK_MIN 0 #define RTU_PMASK_MIN 0
#define RTU_PMASK_MAX ((1 << NPORTS) - 1) #define RTU_PMASK_MAX ((1 << NPORTS) - 1)
...@@ -87,7 +89,7 @@ struct vlan_sets { ...@@ -87,7 +89,7 @@ struct vlan_sets {
struct s_port_vlans struct s_port_vlans
{ {
int valid_mask; int valid_mask;
char qmode; char pmode;
char fix_prio; char fix_prio;
char prio_val; char prio_val;
int vid; int vid;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment