diff --git a/gtests/net/packetdrill/netdev.c b/gtests/net/packetdrill/netdev.c index 5cc6a587622879f263f3d771824d7c1273836d79..5add164d7a43529ab71532625d6d4ecf55e8cd4a 100644 --- a/gtests/net/packetdrill/netdev.c +++ b/gtests/net/packetdrill/netdev.c @@ -44,9 +44,6 @@ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) #include <net/if_tun.h> #endif /* defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) */ -#if defined(linux) -#include <linux/version.h> -#endif #include "ip.h" #include "ipv6.h" @@ -206,11 +203,11 @@ static void set_device_offload_flags(struct local_netdev *netdev) #ifdef linux u32 offload = TUN_F_CSUM | TUN_F_TSO4 | TUN_F_TSO6 | TUN_F_TSO_ECN; -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0)) || (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)) - offload |= TUN_F_UFO; -#endif if (ioctl(netdev->tun_fd, TUNSETOFFLOAD, offload) != 0) die_perror("TUNSETOFFLOAD"); + /* Linux 3.18 doesn't support TUN_F_UFO. So try and ignore... */ + offload = TUN_F_UFO; + ioctl(netdev->tun_fd, TUNSETOFFLOAD, offload); #endif }