[ovs-dev] [PATCH 4/4] datapath: Account for already defined NETIF_F_GSO_ENCAP_ALL

Thomas Graf tgraf at noironetworks.com
Wed Dec 3 12:02:34 UTC 2014


Relates-to: f6eec614 ("openvswitch: Enable tunnel GSO for OVS bridge.")
Signed-off-by: Thomas Graf <tgraf at noironetworks.com>
---
 datapath/linux/compat/include/linux/netdev_features.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/datapath/linux/compat/include/linux/netdev_features.h b/datapath/linux/compat/include/linux/netdev_features.h
index 9f6331d..04eb77d 100644
--- a/datapath/linux/compat/include/linux/netdev_features.h
+++ b/datapath/linux/compat/include/linux/netdev_features.h
@@ -42,6 +42,7 @@
 #define NETIF_F_GSO_MPLS 0
 #endif
 
+#ifndef NETIF_F_GSO_ENCAP_ALL
 #define NETIF_F_GSO_ENCAP_ALL	(NETIF_F_GSO_GRE |			\
 				 NETIF_F_GSO_GRE_CSUM |			\
 				 NETIF_F_GSO_IPIP |			\
@@ -52,3 +53,5 @@
 #endif
 
 #endif
+
+#endif
-- 
1.9.3




More information about the dev mailing list