--- zzzz-none-000/linux-2.6.28.10/include/linux/if_vlan.h	2009-05-02 18:54:43.000000000 +0000
+++ fusiv-7390-686/linux-2.6.28.10/include/linux/if_vlan.h	2015-03-02 14:51:27.000000000 +0000
@@ -63,7 +63,12 @@
 	return (struct vlan_ethhdr *)skb_mac_header(skb);
 }
 
-#define VLAN_VID_MASK	0xfff
+#define VLAN_PRIO_MASK      0xe000 /* Priority Code Point */
+#define VLAN_PRIO_SHIFT     13
+#define VLAN_CFI_MASK       0x1000 /* Canonical Format Indicator */
+#define VLAN_TAG_PRESENT    VLAN_CFI_MASK
+#define VLAN_VID_MASK       0x0fff /* VLAN Identifier */
+#define VLAN_N_VID      4096
 
 /* found in socket.c */
 extern void vlan_ioctl_set(int (*hook)(struct net *, void __user *));
@@ -117,26 +122,28 @@
 extern int vlan_hwaccel_do_receive(struct sk_buff *skb);
 
 #else
-static inline struct net_device *vlan_dev_real_dev(const struct net_device *dev)
+static inline struct net_device *vlan_dev_real_dev(const struct net_device *dev __attribute__ ((unused)))
 {
 	BUG();
 	return NULL;
 }
 
-static inline u16 vlan_dev_vlan_id(const struct net_device *dev)
+static inline u16 vlan_dev_vlan_id(const struct net_device *dev __attribute__ ((unused)))
 {
 	BUG();
 	return 0;
 }
 
-static inline int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,
-				    u16 vlan_tci, int polling)
+static inline int __vlan_hwaccel_rx(struct sk_buff *skb __attribute__ ((unused)),
+                                    struct vlan_group *grp __attribute__ ((unused)),
+                                    u16 vlan_tci __attribute__ ((unused)),
+                                    int polling __attribute__ ((unused)))
 {
 	BUG();
 	return NET_XMIT_SUCCESS;
 }
 
-static inline int vlan_hwaccel_do_receive(struct sk_buff *skb)
+static inline int vlan_hwaccel_do_receive(struct sk_buff *skb __attribute__ ((unused)))
 {
 	return 0;
 }