From 56a3eb24e76338097b7929be601f85242f84afbd Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Wed, 3 Dec 2014 13:02:34 +0100 Subject: datapath: Account for already defined NETIF_F_GSO_ENCAP_ALL Relates-to: f6eec614 ("openvswitch: Enable tunnel GSO for OVS bridge.") Signed-off-by: Thomas Graf Acked-by: Pravin B Shelar --- 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 9f6331d1c..04eb77dc0 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 -- cgit v1.2.3