Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[pandora-kernel.git] / net / tipc / socket.c

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index b71739f..45832fb 100644 (file)
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -1020,7 +1020,7 @@ restart:
 
        if (!err) {
                buf_crs = (unsigned char *)(TIPC_SKB_CB(buf)->handle);
-               sz = buf->tail - buf_crs;
+               sz = skb_tail_pointer(buf) - buf_crs;
 
                needed = (buf_len - sz_copied);
                sz_to_copy = (sz <= needed) ? sz : needed;