| commit | a406f06790a87e20ad368704e4032d69ad5f2dce | [log] [tgz] |
|---|---|---|
| author | abat <abat@bigswitch.com> | Tue Apr 15 18:10:37 2014 -0700 |
| committer | abat <abat@bigswitch.com> | Tue Apr 15 18:10:37 2014 -0700 |
| tree | b462dacd2101569a35e250b23cfdd09e15717e1c | |
| parent | 25e077e9cd8e1c74f82088b6434bc637f65e11c3 [diff] | |
| parent | 7e7aa357dee7f04f22c44cfc7e5bd4862d5a9659 [diff] |
Merge into master from pull request #246: Fix bsn_vport subtype and add l2gre vport (https://github.com/floodlight/loxigen/pull/246)
diff --git a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/VlanVid.java b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/VlanVid.java index 2e675d4..ee605de 100644 --- a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/VlanVid.java +++ b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/VlanVid.java
@@ -33,6 +33,8 @@ } public static VlanVid ofVlan(int vid) { + if (vid == NO_MASK.vid) + return NO_MASK; if ((vid & VALIDATION_MASK) != vid) throw new IllegalArgumentException(String.format("Illegal VLAN value: %x", vid)); return new VlanVid((short) vid);