summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAllan Stephens <allan.stephens@windriver.com>2008-04-15 19:03:23 -0700
committerDavid S. Miller <davem@davemloft.net>2008-04-15 19:03:23 -0700
commitfe13dda2d24eca2ee8a6bb8a0af88ab84d589fd6 (patch)
tree3f4a5cc599f45c6523fed71814cd7a571e049023 /net
parentbdc82bee43d11c093ff0378acef2a9550891cbb9 (diff)
downloadlinux-fe13dda2d24eca2ee8a6bb8a0af88ab84d589fd6.tar.bz2
[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')
-rw-r--r--net/tipc/core.h12
-rw-r--r--net/tipc/link.c6
2 files changed, 18 insertions, 0 deletions
diff --git a/net/tipc/core.h b/net/tipc/core.h
index b3c9df385bbc..325404fd4eb5 100644
--- a/net/tipc/core.h
+++ b/net/tipc/core.h
@@ -337,4 +337,16 @@ static inline void buf_discard(struct sk_buff *skb)
kfree_skb(skb);
}
+/**
+ * buf_linearize - convert a TIPC message buffer into a single contiguous piece
+ * @skb: message buffer
+ *
+ * Returns 0 on success.
+ */
+
+static inline int buf_linearize(struct sk_buff *skb)
+{
+ return skb_linearize(skb);
+}
+
#endif
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;