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: clear l4_rxhash in skb_clear_hash.
[sliver-openvswitch.git]
/
datapath
/
linux
/
compat
/
include
/
linux
/
skbuff.h
diff --git
a/datapath/linux/compat/include/linux/skbuff.h
b/datapath/linux/compat/include/linux/skbuff.h
index
cc2bf0e
..
a9dc2e7
100644
(file)
--- a/
datapath/linux/compat/include/linux/skbuff.h
+++ b/
datapath/linux/compat/include/linux/skbuff.h
@@
-243,27
+243,34
@@
static inline int skb_unclone(struct sk_buff *skb, gfp_t pri)
}
#endif
}
#endif
-#if
LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0)
+#if
ndef HAVE_SKB_ORPHAN_FRAGS
static inline int skb_orphan_frags(struct sk_buff *skb, gfp_t gfp_mask)
{
return 0;
}
static inline int skb_orphan_frags(struct sk_buff *skb, gfp_t gfp_mask)
{
return 0;
}
-#endif
/* LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0) */
+#endif
+#ifndef HAVE_SKB_GET_HASH
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
-#define __skb_get_
rx
hash rpl__skb_get_rxhash
-#define skb_get_
rx
hash rpl_skb_get_rxhash
+#define __skb_get_hash rpl__skb_get_rxhash
+#define skb_get_hash rpl_skb_get_rxhash
-extern u32 __skb_get_
rx
hash(struct sk_buff *skb);
-static inline __u32 skb_get_
rx
hash(struct sk_buff *skb)
+extern u32 __skb_get_hash(struct sk_buff *skb);
+static inline __u32 skb_get_hash(struct sk_buff *skb)
{
#ifdef HAVE_RXHASH
if (skb->rxhash)
return skb->rxhash;
#endif
{
#ifdef HAVE_RXHASH
if (skb->rxhash)
return skb->rxhash;
#endif
- return __skb_get_
rx
hash(skb);
+ return __skb_get_hash(skb);
}
}
+#else
+#define skb_get_hash skb_get_rxhash
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) */
+#endif /* HAVE_SKB_GET_HASH */
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
static inline void skb_tx_error(struct sk_buff *skb)
{
return;
static inline void skb_tx_error(struct sk_buff *skb)
{
return;
@@
-276,6
+283,17
@@
int skb_zerocopy(struct sk_buff *to, struct sk_buff *from, int len,
int hlen);
#endif
int hlen);
#endif
+#ifndef HAVE_SKB_CLEAR_HASH
+static inline void skb_clear_hash(struct sk_buff *skb)
+{
+#if HAVE_RXHASH
+ skb->rxhash = 0;
+#endif
+#if HAVE_L4_RXHASH
+ skb->l4_rxhash = 0;
+#endif
+}
+#endif
#ifndef HAVE_SKB_HAS_FRAG_LIST
#define skb_has_frag_list skb_has_frags
#ifndef HAVE_SKB_HAS_FRAG_LIST
#define skb_has_frag_list skb_has_frags