Menu
▾
▴
[Tipc-discussion] Could you take a look at this
|
From: Mark H. <ma...@os...> - 2004-03-26 19:55:49
|
I got around to cleaning up all the compile errors with the 2.6 kernel.
I have enclosed diffs. If these seem correct, I can check them in.
Thanks,
Mark.
---------
diff -Nru --exclude=CVS /home/markh/views/tipc/cvs_rw/source/unstable/net/tipc/port.c /home/markh/views/tipc/cvs/source/unstable/net/tipc/port.c
--- /home/markh/views/tipc/cvs_rw/source/unstable/net/tipc/port.c 2004-03-11 07:33:30.000000000 -0800
+++ /home/markh/views/tipc/cvs/source/unstable/net/tipc/port.c 2004-03-26 11:34:48.170290279 -0800
@@ -467,7 +467,7 @@
this = port_lock_deref(msg_destport(msg));
if (this->publ.connected)
port_abort_self(this,err);
- spin_unlock_bh(this->lock);
+ spin_unlock_bh(this->publ.lock);
}
tipc_reject_msg(buf,err);
}
@@ -621,7 +621,7 @@
this->probing_state = CONFIRMED;
port_incr_out_seqno(this);
exit:
- spin_unlock_bh(this->lock);
+ spin_unlock_bh(this->publ.lock);
buf_discard(buf);
}
#define DBG_OUTPUT 0
@@ -732,7 +732,7 @@
tipc_conn_msg_event cb = uport->conn_msg_cb;
tipc_ref_t peer_port = port_peerport(dport);
tipc_net_addr_t peer_node = port_peernode(dport);
- spin_unlock_bh(dport->lock);
+ spin_unlock_bh(dport->publ.lock);
if (unlikely(!connected)) {
if (unlikely(published))
goto reject;
@@ -750,7 +750,7 @@
}
case TIPC_DIRECT_MSG:{
tipc_msg_event cb = uport->msg_cb;
- spin_unlock_bh(dport->lock);
+ spin_unlock_bh(dport->publ.lock);
if (unlikely(connected))
goto reject;
if (unlikely(!cb))
@@ -761,7 +761,7 @@
}
case TIPC_NAMED_MSG:{
tipc_named_msg_event cb = uport->named_msg_cb;
- spin_unlock_bh(dport->lock);
+ spin_unlock_bh(dport->publ.lock);
if (unlikely(connected))
goto reject;
if (unlikely(!cb))
@@ -787,7 +787,7 @@
tipc_conn_shutdown_event cb = uport->conn_err_cb;
tipc_ref_t peer_port = port_peerport(dport);
tipc_net_addr_t peer_node = port_peernode(dport);
- spin_unlock_bh(dport->lock);
+ spin_unlock_bh(dport->publ.lock);
if (!connected || !cb)
break;
if (msg_origport(msg) != peer_port)
@@ -801,7 +801,7 @@
}
case TIPC_DIRECT_MSG:{
tipc_msg_err_event cb = uport->err_cb;
- spin_unlock_bh(dport->lock);
+ spin_unlock_bh(dport->publ.lock);
if (connected || !cb)
break;
cb(usr_handle,dref,msg_data(msg),msg_data_sz(msg),
@@ -810,7 +810,7 @@
}
case TIPC_NAMED_MSG:{
tipc_named_msg_err_event cb = uport->named_err_cb;
- spin_unlock_bh(dport->lock);
+ spin_unlock_bh(dport->publ.lock);
if (connected || !cb)
break;
dseq.type = msg_nametype(msg);
@@ -856,7 +856,7 @@
k_signal((Handler)port_dispatcher_sigh, 0);
}
spin_unlock_bh(&queue_lock);
- spin_unlock_bh(port->lock);
+ spin_unlock_bh(this->lock);
return TIPC_OK;
}
@@ -869,7 +869,7 @@
{
struct user_port *this = ((struct port*)port)->user_port;
tipc_continue_event cb;
- spin_unlock_bh(port->publ.lock);
+ spin_unlock_bh(port->lock);
cb = this->continue_event_cb;
if (cb)
cb(this->usr_handle,port->ref);
diff -Nru --exclude=CVS /home/markh/views/tipc/cvs_rw/source/unstable/net/tipc/proc.c /home/markh/views/tipc/cvs/source/unstable/net/tipc/proc.c
--- /home/markh/views/tipc/cvs_rw/source/unstable/net/tipc/proc.c 2004-03-09 09:29:32.000000000 -0800
+++ /home/markh/views/tipc/cvs/source/unstable/net/tipc/proc.c 2004-03-26 11:44:16.675530840 -0800
@@ -51,7 +51,6 @@
#include <linux/poll.h>
#include <linux/dirent.h>
#include <linux/list.h>
-#include <stdio.h>
#include <tipc_adapt.h>
#include <tipc_msg.h>
diff -Nru --exclude=CVS /home/markh/views/tipc/cvs_rw/source/unstable/net/tipc/socket.c /home/markh/views/tipc/cvs/source/unstable/net/tipc/socket.c
--- /home/markh/views/tipc/cvs_rw/source/unstable/net/tipc/socket.c 2004-03-11 07:33:30.000000000 -0800
+++ /home/markh/views/tipc/cvs/source/unstable/net/tipc/socket.c 2004-03-26 11:26:52.240799868 -0800
@@ -429,7 +429,7 @@
#else
static int
send_msg(struct kiocb *iocb, struct socket *sock,
- struct msghdr *m, int total_len)
+ struct msghdr *m, size_t total_len)
#endif
{
int res = -EINVAL;
@@ -489,7 +489,7 @@
#else
static int
send_packet(struct kiocb *iocb, struct socket *sock,
- struct msghdr *m, int total_len)
+ struct msghdr *m, size_t total_len)
#endif
{
int res;
@@ -497,7 +497,11 @@
struct sockaddr_tipc *dest = (struct sockaddr_tipc *) m->msg_name;
if (unlikely(dest))
+#ifdef TIPC_LINUX_2_4
return send_msg(sock,m,total_len,scm);
+#else
+ return send_msg(0, sock, m, total_len);
+#endif
if (down_interruptible(&tsock->sem))
return -ERESTARTSYS;
@@ -540,7 +544,7 @@
#else
static int
send_stream(struct kiocb *iocb, struct socket *sock,
- struct msghdr *m, int total_len)
+ struct msghdr *m, size_t total_len)
#endif
{
uint i,o,sz;
@@ -549,7 +553,11 @@
struct msghdr msg;
unchar *crs;
uint rest;
+#ifdef TIPC_LINUX_2_4
int res = send_packet(sock,m,0,0);
+#else
+ int res = send_packet(0, sock, m, 0);
+#endif
if (likely(res != -EINVAL))
return res;
@@ -588,7 +596,11 @@
crs+= ov[o].iov_len;
rest-= ov[o].iov_len;
}
+#ifdef TIPC_LINUX_2_4
res = send_packet(sock,&msg,0,0);
+#else
+ res = send_packet(0, sock, &msg, 0);
+#endif
sz = o = 0;
}
return res;
@@ -642,7 +654,7 @@
#else
static int
recv_msg(struct kiocb *iocb, struct socket *sock,
- struct msghdr *m, int buf_len, int flags)
+ struct msghdr *m, size_t buf_len, int flags)
#endif
{
struct iovec *iv = m->msg_iov;
@@ -721,7 +733,7 @@
#else
static int
recv_stream(struct kiocb *iocb, struct socket *sock,
- struct msghdr *m, int buf_len, int flags)
+ struct msghdr *m, size_t buf_len, int flags)
#endif
{
struct tipc_sock *tsock = get_tipc_sock(sock);
@@ -900,7 +912,11 @@
/* Send a 'SYN', i.e. an empty connectionless msg to dest: */
m.msg_name = dst;
+#ifdef TIPC_LINUX_2_4
send_msg(sk,&m,0,0);
+#else
+ send_msg(0, sk, &m, 0);
+#endif
if (down_interruptible(&tsock->sem))
return -ERESTARTSYS;
@@ -962,7 +978,11 @@
if (!msg_data_sz(buf_msg(tsock->queue_head))){
struct msghdr m = {0,};
dbg("accept %x, sending SYN\n",sk);
+#ifdef TIPC_LINUX_2_4
send_packet(newsk,&m,0,0);
+#else
+ send_packet(0, newsk, &m, 0);
+#endif
advance_queue(tsock);
goto exit;
}
@@ -1237,7 +1257,7 @@
s->usr_handle = (void *) tsock->p->ref;
s->usr_next = tsock->sub_list;
tsock->sub_list = s;
- spin_unlock_bh(&tsock->p->lock);
+ spin_unlock_bh(tsock->p->lock);
put_user(s->s.ref, &((struct tipc_subscr *) arg)->ref);
up(&tsock->sem);
return 0;
diff -Nru --exclude=CVS /home/markh/views/tipc/cvs_rw/source/unstable/net/tipc/udp_media.c /home/markh/views/tipc/cvs/source/unstable/net/tipc/udp_media.c
--- /home/markh/views/tipc/cvs_rw/source/unstable/net/tipc/udp_media.c 2004-02-16 15:00:02.000000000 -0800
+++ /home/markh/views/tipc/cvs/source/unstable/net/tipc/udp_media.c 2004-03-26 11:52:20.918351469 -0800
@@ -140,7 +140,11 @@
bearer.iov.iov_len = length;
msg_dbg(buf_msg(skb),"Sending:");
bearer.udp_hdr.msg_name = (void *)&dest->dev_addr.addr_in;
+#ifdef TIPC_LINUX_2_4
if (atomic_read(&sk->sk->wmem_alloc) < sk->sk->sndbuf){
+#else
+ if (atomic_read(&sk->sk->sk_wmem_alloc) < sk->sk->sk_sndbuf){
+#endif
sock_sendmsg(sk, &bearer.udp_hdr, length);
}
set_fs(saved_addr);
--
Mark Haverkamp <ma...@os...>
|
