diff --git a/pkg/config/config.go b/pkg/config/config.go index 4677a93e2..8cdf6c04e 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -79,10 +79,6 @@ func LoadConf(bytes []byte) (*sriovtypes.NetConf, error) { return nil, fmt.Errorf("LoadConf(): vlan id %d invalid: value must be in the range 0-4094", *n.Vlan) } - if *n.Vlan == 0 && (n.VlanQoS != nil || n.VlanProto != nil) { - return nil, fmt.Errorf("LoadConf(): non-zero vlan id must be configured to set vlan Qos and/or Proto") - } - if n.VlanQoS == nil { qos := 0 n.VlanQoS = &qos diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go index f3a642bec..6a0156a9a 100644 --- a/pkg/config/config_test.go +++ b/pkg/config/config_test.go @@ -108,14 +108,10 @@ var _ = Describe("Config", func() { }, Entry("valid vlan ID", &validVlanID, nil, nil, false), Entry("invalid vlan ID", &invalidVlanID, nil, nil, true), - Entry("vlan ID equal to zero and QoS set", &zeroVlanID, &validQoS, nil, true), - Entry("vlan ID equal to zero and Proto set", &zeroVlanID, nil, &valid8021qProto, true), Entry("invalid QoS", &validVlanID, &invalidQoS, nil, true), Entry("invalid Proto", &validVlanID, nil, &invalidProto, true), Entry("valid 802.1q Proto", &validVlanID, nil, &valid8021qProto, false), Entry("valid 802.1ad Proto", &validVlanID, nil, &valid8021adProto, false), - Entry("no vlan ID and QoS set", nil, &validQoS, nil, true), - Entry("no vlan ID and Proto set", nil, nil, &valid8021adProto, true), ) It("Assuming device is allocated", func() {