From fe13dda2d24eca2ee8a6bb8a0af88ab84d589fd6 Mon Sep 17 00:00:00 2001
From: Allan Stephens <allan.stephens@windriver.com>
Date: Tue, 15 Apr 2008 19:03:23 -0700
Subject: [TIPC]: Force linearization of non-linear sk_buffs

This patch allows TIPC to process incoming messages that are
stored in a fragmented sk_buff, by forcing the linearization
of any such messages it receives.

Note: This is an interim solution to allow TIPC to operate with
Ethernet devices that generate non-linear buffers (such as the
gianfar driver), until such time as the rest of TIPC is enhanced
to handle sk_buffs with multiple data areas.

Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 net/tipc/link.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'net/tipc/link.c')

diff --git a/net/tipc/link.c b/net/tipc/link.c
index a42f43430101..087379366d3c 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -1811,6 +1811,12 @@ void tipc_recv_msg(struct sk_buff *head, struct tipc_bearer *tb_ptr)
 #endif
 			msg_dbg(msg,"<REC<");
 
+		/* Ensure message data is a single contiguous unit */
+
+		if (unlikely(buf_linearize(buf))) {
+			goto cont;
+		}
+
 		if (unlikely(msg_non_seq(msg))) {
 			link_recv_non_seq(buf);
 			continue;
-- 
cgit v1.2.3-59-g8ed1b