projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "master" into "next".
[openvswitch]
/
datapath
/
linux-2.6
/
compat-2.6
/
include
/
linux
/
skbuff.h
diff --git
a/datapath/linux-2.6/compat-2.6/include/linux/skbuff.h
b/datapath/linux-2.6/compat-2.6/include/linux/skbuff.h
index edeba5ae26b334e650ffed79f392fc0b2a19bdaf..d9f043ac6442960e8f5841b06dd070b1881a86da 100644
(file)
--- a/
datapath/linux-2.6/compat-2.6/include/linux/skbuff.h
+++ b/
datapath/linux-2.6/compat-2.6/include/linux/skbuff.h
@@
-113,9
+113,7
@@
static inline void kfree_skb_maybe_null(struct sk_buff *skb)
#ifndef CHECKSUM_PARTIAL
#ifndef CHECKSUM_PARTIAL
-/* Note that CHECKSUM_PARTIAL is not implemented, but this allows us to at
- * least test against it: see update_csum() in forward.c. */
-#define CHECKSUM_PARTIAL 3
+#define CHECKSUM_PARTIAL CHECKSUM_HW
#endif
#ifndef CHECKSUM_COMPLETE
#define CHECKSUM_COMPLETE CHECKSUM_HW
#endif
#ifndef CHECKSUM_COMPLETE
#define CHECKSUM_COMPLETE CHECKSUM_HW
@@
-149,6
+147,11
@@
static inline unsigned char *skb_network_header(const struct sk_buff *skb)
return skb->nh.raw;
}
return skb->nh.raw;
}
+static inline void skb_reset_network_header(struct sk_buff *skb)
+{
+ skb->nh.raw = skb->data;
+}
+
static inline void skb_set_network_header(struct sk_buff *skb, const int offset)
{
skb->nh.raw = skb->data + offset;
static inline void skb_set_network_header(struct sk_buff *skb, const int offset)
{
skb->nh.raw = skb->data + offset;