From: Tom Keiser <tkeiser@gmail.com>
Date: Thu, 26 Jan 2006 15:53:36 +0000 (+0000)
Subject: STABLE14-ukernel-rx-knet-deref-20060126
X-Git-Tag: openafs-stable-1_4_1-rc6~14
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=8f56562c950e3d3cb477477f5bdb91d26be11252;p=packages%2Fo%2Fopenafs.git

STABLE14-ukernel-rx-knet-deref-20060126

FIXES 25927

pass correct parameter to avoid type mismatch


(cherry picked from commit 27c42be1b9dced92f578664d57f2dd92aa21c8a0)
---

diff --git a/src/rx/UKERNEL/rx_knet.c b/src/rx/UKERNEL/rx_knet.c
index 2727fd173..c7edbd618 100644
--- a/src/rx/UKERNEL/rx_knet.c
+++ b/src/rx/UKERNEL/rx_knet.c
@@ -76,7 +76,7 @@ rxi_ListenerProc(osi_socket usockp, int *tnop, struct rx_call **newcallp)
     while (1) {
 	tp = rxi_AllocPacket(RX_PACKET_CLASS_RECEIVE);
 	usr_assert(tp != NULL);
-	rc = rxi_ReadPacket(usockp->sock, tp, &host, &port);
+	rc = rxi_ReadPacket(usockp, tp, &host, &port);
 	if (rc != 0) {
 	    tp = rxi_ReceivePacket(tp, usockp, host, port, tnop, newcallp);
 	    if (newcallp && *newcallp) {
@@ -335,7 +335,7 @@ rxi_Recvmsg(int socket, struct msghdr *msg_p, int flags)
 {
     int ret;
     do {
-	ret = recvmsg(socket, msg_p, flags);
+	ret = recvmsg(socket->sock, msg_p, flags);
     } while (ret == -1 && errno == EAGAIN);
     return ret;
 }