projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: Fix build with backported netdev_alloc_skb_ip_align()
[openvswitch]
/
datapath
/
linux-2.6
/
compat-2.6
/
dev-openvswitch.c
diff --git
a/datapath/linux-2.6/compat-2.6/dev-openvswitch.c
b/datapath/linux-2.6/compat-2.6/dev-openvswitch.c
index 7be33f6e7eae70d9032c7271cfbc27f0710f420c..5b7444bb3f20e70f581b0eb9371735afc9653ce4 100644
(file)
--- a/
datapath/linux-2.6/compat-2.6/dev-openvswitch.c
+++ b/
datapath/linux-2.6/compat-2.6/dev-openvswitch.c
@@
-1,12
+1,8
@@
-#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
+#ifndef HAVE_DEV_DISABLE_LRO
#include <linux/netdevice.h>
#include <linux/netdevice.h>
-#ifndef NETIF_F_LRO
-void dev_disable_lro(struct net_device *dev) { }
-#else
-
+#ifdef NETIF_F_LRO
#include <linux/ethtool.h>
/**
#include <linux/ethtool.h>
/**
@@
-29,7
+25,8
@@
void dev_disable_lro(struct net_device *dev)
}
WARN_ON(dev->features & NETIF_F_LRO);
}
}
WARN_ON(dev->features & NETIF_F_LRO);
}
-
+#else
+void dev_disable_lro(struct net_device *dev) { }
#endif /* NETIF_F_LRO */
#endif /* NETIF_F_LRO */
-#endif /*
kernel < 2.6.27
*/
+#endif /*
HAVE_DEV_DISABLE_LRO
*/