D44590.id136432.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D44590.id136432.diff
View Options

	diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h
	--- a/sys/compat/linuxkpi/common/include/linux/skbuff.h
	+++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h
	@@ -89,6 +89,7 @@
	};

	#define NET_SKB_PAD max(CACHE_LINE_SIZE, 32)
	+#define SKB_DATA_ALIGN(_x) roundup2(_x, CACHE_LINE_SIZE)

	struct sk_buff_head {
	/* XXX TODO */
	@@ -824,7 +825,7 @@
	}

	static inline void
	-___skb_queue_splice_init(const struct sk_buff_head *from,
	+___skb_queue_splice(const struct sk_buff_head *from,
	struct sk_buff p, struct sk_buff n)
	{
	struct sk_buff b, e;
	@@ -847,11 +848,24 @@
	if (skb_queue_empty(from))
	return;

	- ___skb_queue_splice_init(from, (struct sk_buff *)to, to->next);
	+ ___skb_queue_splice(from, (struct sk_buff *)to, to->next);
	to->qlen += from->qlen;
	__skb_queue_head_init(from);
	}

	+static inline void
	+skb_queue_splice_tail_init(struct sk_buff_head from, struct sk_buff_head to)
	+{
	+
	+ SKB_TRACE2(from, to);
	+
	+ if (skb_queue_empty(from)) {
	+ ___skb_queue_splice(from, to->prev, (struct sk_buff *)to);
	+ to->qlen += from->qlen;
	+ __skb_queue_head_init(from);
	+ }
	+}
	+
	static inline void
	skb_reset_transport_header(struct sk_buff *skb)
	{