| Message ID | 1457660770-22327-1-git-send-email-blp@ovn.org |
|---|---|
| State | Accepted |
| Headers | show |
Now you can tell people RTFM! Acked-by: Justin Pettit <jpettit@ovn.org> --Justin > On Mar 10, 2016, at 5:46 PM, Ben Pfaff <blp@ovn.org> wrote: > > This one is actually useful, I don't know how I omitted it whenever I wrote > this documentation. > > Signed-off-by: Ben Pfaff <blp@ovn.org> > --- > Supersedes http://openvswitch.org/pipermail/dev/2016-March/067562.html > > DESIGN.md | 4 ++++ > utilities/ovs-ofctl.8.in | 5 ++++- > 2 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/DESIGN.md b/DESIGN.md > index 6865d47..a330312 100644 > --- a/DESIGN.md > +++ b/DESIGN.md > @@ -426,6 +426,7 @@ version works. > [8] 0000/efff <none> <none> <none> > [9] 1001/1001 <none> <none> 1001/1001,-- > [10] 3000/3000 <none> <none> <none> > + [11] 1000/1000 <none> fffe/0,??/1 1000/1000,-- > > Each column is interpreted as follows. > > @@ -512,6 +513,9 @@ The matches are: > is just an example; one can match on any desired VID bit > pattern.) > > +[11] Matches any packet with an 802.1Q header, regardless of VID or > + PCP. > + > Additional notes: > > - OF1.2: The top three bits of OXM_OF_VLAN_VID are fixed to zero, > diff --git a/utilities/ovs-ofctl.8.in b/utilities/ovs-ofctl.8.in > index bc3ddae..1b0718d 100644 > --- a/utilities/ovs-ofctl.8.in > +++ b/utilities/ovs-ofctl.8.in > @@ -1051,7 +1051,10 @@ header with the CFI bit (with value \fB0x1000\fR) forced to 1. > Examples: > .RS > .IP \fBvlan_tci=0\fR > -Match only packets without an 802.1Q header. > +Match packets without an 802.1Q header. > +.IP \fBvlan_tci=0x1000/0x1000\fR > +Match packets with an 802.1Q header, regardless of VLAN and priority > +values. > .IP \fBvlan_tci=0xf123\fR > Match packets tagged with priority 7 in VLAN 0x123. > .IP \fBvlan_tci=0x1123/0x1fff\fR > -- > 2.1.3 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > http://openvswitch.org/mailman/listinfo/dev
Thanks, applied to master. On Thu, Mar 10, 2016 at 06:02:38PM -0800, Justin Pettit wrote: > Now you can tell people RTFM! > > Acked-by: Justin Pettit <jpettit@ovn.org> > > --Justin > > > > On Mar 10, 2016, at 5:46 PM, Ben Pfaff <blp@ovn.org> wrote: > > > > This one is actually useful, I don't know how I omitted it whenever I wrote > > this documentation. > > > > Signed-off-by: Ben Pfaff <blp@ovn.org> > > --- > > Supersedes http://openvswitch.org/pipermail/dev/2016-March/067562.html > > > > DESIGN.md | 4 ++++ > > utilities/ovs-ofctl.8.in | 5 ++++- > > 2 files changed, 8 insertions(+), 1 deletion(-) > > > > diff --git a/DESIGN.md b/DESIGN.md > > index 6865d47..a330312 100644 > > --- a/DESIGN.md > > +++ b/DESIGN.md > > @@ -426,6 +426,7 @@ version works. > > [8] 0000/efff <none> <none> <none> > > [9] 1001/1001 <none> <none> 1001/1001,-- > > [10] 3000/3000 <none> <none> <none> > > + [11] 1000/1000 <none> fffe/0,??/1 1000/1000,-- > > > > Each column is interpreted as follows. > > > > @@ -512,6 +513,9 @@ The matches are: > > is just an example; one can match on any desired VID bit > > pattern.) > > > > +[11] Matches any packet with an 802.1Q header, regardless of VID or > > + PCP. > > + > > Additional notes: > > > > - OF1.2: The top three bits of OXM_OF_VLAN_VID are fixed to zero, > > diff --git a/utilities/ovs-ofctl.8.in b/utilities/ovs-ofctl.8.in > > index bc3ddae..1b0718d 100644 > > --- a/utilities/ovs-ofctl.8.in > > +++ b/utilities/ovs-ofctl.8.in > > @@ -1051,7 +1051,10 @@ header with the CFI bit (with value \fB0x1000\fR) forced to 1. > > Examples: > > .RS > > .IP \fBvlan_tci=0\fR > > -Match only packets without an 802.1Q header. > > +Match packets without an 802.1Q header. > > +.IP \fBvlan_tci=0x1000/0x1000\fR > > +Match packets with an 802.1Q header, regardless of VLAN and priority > > +values. > > .IP \fBvlan_tci=0xf123\fR > > Match packets tagged with priority 7 in VLAN 0x123. > > .IP \fBvlan_tci=0x1123/0x1fff\fR > > -- > > 2.1.3 > > > > _______________________________________________ > > dev mailing list > > dev@openvswitch.org > > http://openvswitch.org/mailman/listinfo/dev >
diff --git a/DESIGN.md b/DESIGN.md index 6865d47..a330312 100644 --- a/DESIGN.md +++ b/DESIGN.md @@ -426,6 +426,7 @@ version works. [8] 0000/efff <none> <none> <none> [9] 1001/1001 <none> <none> 1001/1001,-- [10] 3000/3000 <none> <none> <none> + [11] 1000/1000 <none> fffe/0,??/1 1000/1000,-- Each column is interpreted as follows. @@ -512,6 +513,9 @@ The matches are: is just an example; one can match on any desired VID bit pattern.) +[11] Matches any packet with an 802.1Q header, regardless of VID or + PCP. + Additional notes: - OF1.2: The top three bits of OXM_OF_VLAN_VID are fixed to zero, diff --git a/utilities/ovs-ofctl.8.in b/utilities/ovs-ofctl.8.in index bc3ddae..1b0718d 100644 --- a/utilities/ovs-ofctl.8.in +++ b/utilities/ovs-ofctl.8.in @@ -1051,7 +1051,10 @@ header with the CFI bit (with value \fB0x1000\fR) forced to 1. Examples: .RS .IP \fBvlan_tci=0\fR -Match only packets without an 802.1Q header. +Match packets without an 802.1Q header. +.IP \fBvlan_tci=0x1000/0x1000\fR +Match packets with an 802.1Q header, regardless of VLAN and priority +values. .IP \fBvlan_tci=0xf123\fR Match packets tagged with priority 7 in VLAN 0x123. .IP \fBvlan_tci=0x1123/0x1fff\fR
This one is actually useful, I don't know how I omitted it whenever I wrote this documentation. Signed-off-by: Ben Pfaff <blp@ovn.org> --- Supersedes http://openvswitch.org/pipermail/dev/2016-March/067562.html DESIGN.md | 4 ++++ utilities/ovs-ofctl.8.in | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)