Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[mv-sheeva.git] / net / tipc / subscr.c

diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
index aae9eae13404d4c2c3eaa30035cbbbee8d025195..6cf7268634857bc78bea5bfa2f67cdc5c80266bc 100644 (file)
--- a/net/tipc/subscr.c
+++ b/net/tipc/subscr.c
@@ -109,7 +109,7 @@ static void subscr_send_event(struct subscription *sub,
        sub->evt.found_upper = htohl(found_upper, sub->swap);
        sub->evt.port.ref = htohl(port_ref, sub->swap);
        sub->evt.port.node = htohl(node, sub->swap);
-       tipc_send(sub->server_ref, 1, &msg_sect);
+       tipc_send(sub->server_ref, 1, &msg_sect, msg_sect.iov_len);
 }
 
 /**
@@ -521,7 +521,7 @@ static void subscr_named_msg_event(void *usr_handle,
 
        /* Send an ACK- to complete connection handshaking */
 
-       tipc_send(server_port_ref, 0, NULL);
+       tipc_send(server_port_ref, 0, NULL, 0);
 
        /* Handle optional subscription request */