--- ifup.orig	2008-09-12 09:51:51.000000000 -0400
+++ ifup	2008-09-12 09:57:11.000000000 -0400
@@ -62,8 +62,8 @@ fi
 # Ethernet 802.1Q VLAN support
 if [ -x /sbin/vconfig -a "${VLAN}" = "yes" -a "$ISALIAS" = "no" ]; then
     VID=""
-    if [[ "${DEVICE}" =~ '^(eth|bond)[0-9]+\.[0-9]{1,4}$' ]]; then
-	VID=$(echo "${DEVICE}" | LC_ALL=C sed 's/^[a-z0-9]*\.0*//')
+    if [[ "${DEVICE}" =~ '^(eth|bond)[0-9a-zA-Z]+\.[0-9]{1,4}$' ]]; then
+	VID=$(echo "${DEVICE}" | LC_ALL=C sed 's/^[a-zA-Z0-9]*\.0*//')
 	PHYSDEV=${DEVICE%.*}
     fi
     if [[ "${DEVICE}" =~ '^vlan[0-9]{1,4}?' ]]; then
@@ -75,6 +75,10 @@ if [ -x /sbin/vconfig -a "${VLAN}" = "ye
 	fi
     fi
     if [ -n "$VID" ]; then
+        if [[ "${VID}" -ge '4096' ]]; then
+            echo $"VLAN ID must be less than 4096 for ${DEVICE}"
+            exit 1
+        fi
 	if [ ! -d /proc/net/vlan ]; then
             if modprobe 8021q >/dev/null 2>&1 ; then
 		test -z "$VLAN_NAME_TYPE" && VLAN_NAME_TYPE=DEV_PLUS_VID_NO_PAD