git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: Revert "datapath: rhel: Account for RHEL specific backports"
[sliver-openvswitch.git]
/
datapath
/
linux
/
compat
/
include
/
linux
/
netdevice.h
diff --git
a/datapath/linux/compat/include/linux/netdevice.h
b/datapath/linux/compat/include/linux/netdevice.h
index
176d1e6
..
ba1fc59
100644
(file)
--- a/
datapath/linux/compat/include/linux/netdevice.h
+++ b/
datapath/linux/compat/include/linux/netdevice.h
@@
-161,17
+161,13
@@
static inline struct net_device *dev_get_by_index_rcu(struct net *net, int ifind
#define NETIF_F_V6_CSUM (NETIF_F_GEN_CSUM | NETIF_F_IPV6_CSUM)
#endif
#define NETIF_F_V6_CSUM (NETIF_F_GEN_CSUM | NETIF_F_IPV6_CSUM)
#endif
-#if
ndef HAVE_SKB_GSO_SEGMENT
+#if
LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
#define skb_gso_segment rpl_skb_gso_segment
struct sk_buff *rpl_skb_gso_segment(struct sk_buff *skb, u32 features);
#define skb_gso_segment rpl_skb_gso_segment
struct sk_buff *rpl_skb_gso_segment(struct sk_buff *skb, u32 features);
-#endif
-#ifndef HAVE_NETIF_SKB_FEATURES
#define netif_skb_features rpl_netif_skb_features
u32 rpl_netif_skb_features(struct sk_buff *skb);
#define netif_skb_features rpl_netif_skb_features
u32 rpl_netif_skb_features(struct sk_buff *skb);
-#endif
-#ifndef HAVE_NETIF_NEEDS_GSO
#define netif_needs_gso rpl_netif_needs_gso
static inline int rpl_netif_needs_gso(struct sk_buff *skb, int features)
{
#define netif_needs_gso rpl_netif_needs_gso
static inline int rpl_netif_needs_gso(struct sk_buff *skb, int features)
{