From: VMware, Inc <>
Date: Mon, 22 Aug 2011 19:51:34 +0000 (-0700)
Subject: Changes in shared code that don't affect open-vm-tools functionality.
X-Git-Tag: 2011.08.21-471295~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d1bb5c797fa0dbefce0da772f768545cbb830229;p=thirdparty%2Fopen-vm-tools.git

Changes in shared code that don't affect open-vm-tools functionality.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/modules/linux/shared/compat_netdevice.h b/open-vm-tools/modules/linux/shared/compat_netdevice.h
index 45bbff6fd..7d4f6f87a 100644
--- a/open-vm-tools/modules/linux/shared/compat_netdevice.h
+++ b/open-vm-tools/modules/linux/shared/compat_netdevice.h
@@ -392,4 +392,10 @@ compat_multiqueue_allowed(struct pci_dev *dev)
 #   endif
 #endif
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
+#   define compat_vlan_get_protocol(skb) vlan_get_protocol(skb)
+#else
+#   define compat_vlan_get_protocol(skb) (skb->protocol)
+#endif
+
 #endif /* __COMPAT_NETDEVICE_H__ */