aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/link.c
diff options
context:
space:
mode:
authorAllan Stephens <allan.stephens@windriver.com>2008-04-15 22:03:23 -0400
committerDavid S. Miller <davem@davemloft.net>2008-04-15 22:03:23 -0400
commitfe13dda2d24eca2ee8a6bb8a0af88ab84d589fd6 (patch)
tree3f4a5cc599f45c6523fed71814cd7a571e049023 /net/tipc/link.c
parentbdc82bee43d11c093ff0378acef2a9550891cbb9 (diff)
[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>
Diffstat (limited to 'net/tipc/link.c')
-rw-r--r--net/tipc/link.c6
1 files changed, 6 insertions, 0 deletions
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)
1811#endif 1811#endif
1812 msg_dbg(msg,"<REC<"); 1812 msg_dbg(msg,"<REC<");
1813 1813
1814 /* Ensure message data is a single contiguous unit */
1815
1816 if (unlikely(buf_linearize(buf))) {
1817 goto cont;
1818 }
1819
1814 if (unlikely(msg_non_seq(msg))) { 1820 if (unlikely(msg_non_seq(msg))) {
1815 link_recv_non_seq(buf); 1821 link_recv_non_seq(buf);
1816 continue; 1822 continue;