Hi,
It seems some parts of the changes from my original patch are missing.
On 01/04/14 14:32, Kyle Mestery wrote:
diff --git a/datapath/linux/compat/skbuff-openvswitch.c
b/datapath/linux/compat/skbuff-openvswitch.c
index ddd7bc8..bcba930 100644
--- a/datapath/linux/compat/skbuff-openvswitch.c
+++ b/datapath/linux/compat/skbuff-openvswitch.c
@@ -62,7 +62,7 @@ skb_zerocopy_headlen(const struct sk_buff *from)
* The `hlen` as calculated by skb_zerocopy_headlen() specifies the
* headroom in the `to` buffer.
*/
-void
+int
skb_zerocopy(struct sk_buff *to, const struct sk_buff *from, int len, int
hlen)
{
int i, j = 0;
The original extended the comment as well, however that's not so crucial
@@ -75,7 +75,7 @@ skb_zerocopy(struct sk_buff *to, const struct sk_buff *from,
int len, int hlen)
/* dont bother with small payloads */
if (len <= skb_tailroom(to)) {
skb_copy_bits(from, 0, skb_put(to, len), len);
- return;
+ return 0;
}
if (hlen) {
But here we should return the return value of skb_copy_bits, a few lines
below as well. And the key thing is the call to skb_orphan_frags, it's
also missing.
@@ -107,5 +107,7 @@ skb_zerocopy(struct sk_buff *to, const struct sk_buff
*from, int len, int hlen)
j++;
}
skb_shinfo(to)->nr_frags = j;
+
+ return 0;
}
#endif
Regards,
Zoli
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
