summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2012-04-24 08:58:33 -0700
committerStephen Hemminger <shemminger@vyatta.com>2012-04-24 08:58:33 -0700
commit8f54b89a3a5840c741cacea572b7b5c39b12b02b (patch)
tree61eb051cfc203555c978679c817c505bf36a7be5
parent3203e040f120da864f6a4dfbd5f0747133bd1aed (diff)
downloadvyatta-cfg-system-8f54b89a3a5840c741cacea572b7b5c39b12b02b.tar.gz
vyatta-cfg-system-8f54b89a3a5840c741cacea572b7b5c39b12b02b.zip
vif: remove check for flags when creating VIF
Bug 8007 The 3.3 kernel removed sysfs features file (/sys/class/net/ethX/features). Detect vlan failure when added instead.
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.def6
1 files changed, 1 insertions, 5 deletions
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.def b/templates/interfaces/ethernet/node.tag/vif/node.def
index d184f4bc..ab6da98e 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.def
@@ -5,11 +5,7 @@ help: Virtual Local Area Network (VLAN) ID
syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4094; "VLAN ID must be between 0 and 4094"
val_help: u32:0-4094; VLAN ID
-create: if [ $(( $(cat /sys/class/net/$VAR(../@)/features) & 1024 )) -eq 1024 ]
- then echo "Error creating VLAN device on $VAR(../@): hardware feature not supported"
- exit 1
- fi
- if ! ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan id $VAR(@)
+create: if ! ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan id $VAR(@)
then echo "Error creating VLAN device $VAR(../@).$VAR(@)"
exit 1
fi