git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
net
/
rxrpc
/
connection.c
diff --git
a/net/rxrpc/connection.c
b/net/rxrpc/connection.c
index
929b82f
..
a978007
100644
(file)
--- a/
net/rxrpc/connection.c
+++ b/
net/rxrpc/connection.c
@@
-88,8
+88,8
@@
static inline int __rxrpc_create_connection(struct rxrpc_peer *peer,
* create a new connection record for outgoing connections
*/
int rxrpc_create_connection(struct rxrpc_transport *trans,
* create a new connection record for outgoing connections
*/
int rxrpc_create_connection(struct rxrpc_transport *trans,
-
uint16_t
port,
-
uint32_t
addr,
+
__be16
port,
+
__be32
addr,
uint16_t service_id,
void *security,
struct rxrpc_connection **_conn)
uint16_t service_id,
void *security,
struct rxrpc_connection **_conn)
@@
-97,7
+97,7
@@
int rxrpc_create_connection(struct rxrpc_transport *trans,
struct rxrpc_connection *candidate, *conn;
struct rxrpc_peer *peer;
struct list_head *_p;
struct rxrpc_connection *candidate, *conn;
struct rxrpc_peer *peer;
struct list_head *_p;
-
uint32_t
connid;
+
__be32
connid;
int ret;
_enter("%p{%hu},%u,%hu", trans, trans->port, ntohs(port), service_id);
int ret;
_enter("%p{%hu},%u,%hu", trans, trans->port, ntohs(port), service_id);
@@
-169,7
+169,7
@@
int rxrpc_create_connection(struct rxrpc_transport *trans,
spin_unlock(&peer->conn_gylock);
/* pick the new candidate */
spin_unlock(&peer->conn_gylock);
/* pick the new candidate */
- _debug("created connection: {%08x} [out]",
hton
l(candidate->conn_id));
+ _debug("created connection: {%08x} [out]",
ntoh
l(candidate->conn_id));
atomic_inc(&peer->conn_count);
conn = candidate;
candidate = NULL;
atomic_inc(&peer->conn_count);
conn = candidate;
candidate = NULL;
@@
-199,7
+199,7
@@
int rxrpc_create_connection(struct rxrpc_transport *trans,
/* handle resurrecting a connection from the graveyard */
found_in_graveyard:
/* handle resurrecting a connection from the graveyard */
found_in_graveyard:
- _debug("resurrecting connection: {%08x} [out]",
hton
l(conn->conn_id));
+ _debug("resurrecting connection: {%08x} [out]",
ntoh
l(conn->conn_id));
rxrpc_get_connection(conn);
rxrpc_krxtimod_del_timer(&conn->timeout);
list_del_init(&conn->link);
rxrpc_get_connection(conn);
rxrpc_krxtimod_del_timer(&conn->timeout);
list_del_init(&conn->link);
@@
-219,8
+219,9
@@
int rxrpc_connection_lookup(struct rxrpc_peer *peer,
struct rxrpc_connection *conn, *candidate = NULL;
struct list_head *_p;
int ret, fresh = 0;
struct rxrpc_connection *conn, *candidate = NULL;
struct list_head *_p;
int ret, fresh = 0;
- u32 x_epoch, x_connid;
- u16 x_port, x_secix, x_servid;
+ __be32 x_epoch, x_connid;
+ __be16 x_port, x_servid;
+ __u32 x_secix;
u8 x_clflag;
_enter("%p{{%hu}},%u,%hu",
u8 x_clflag;
_enter("%p{{%hu}},%u,%hu",
@@
-310,7
+311,7
@@
int rxrpc_connection_lookup(struct rxrpc_peer *peer,
}
/* we can now add the new candidate to the list */
}
/* we can now add the new candidate to the list */
- _debug("created connection: {%08x} [in]",
hton
l(candidate->conn_id));
+ _debug("created connection: {%08x} [in]",
ntoh
l(candidate->conn_id));
rxrpc_get_peer(peer);
conn = candidate;
candidate = NULL;
rxrpc_get_peer(peer);
conn = candidate;
candidate = NULL;
@@
-351,7
+352,7
@@
int rxrpc_connection_lookup(struct rxrpc_peer *peer,
/* handle resurrecting a connection from the graveyard */
found_in_graveyard:
/* handle resurrecting a connection from the graveyard */
found_in_graveyard:
- _debug("resurrecting connection: {%08x} [in]",
hton
l(conn->conn_id));
+ _debug("resurrecting connection: {%08x} [in]",
ntoh
l(conn->conn_id));
rxrpc_get_peer(peer);
rxrpc_get_connection(conn);
rxrpc_krxtimod_del_timer(&conn->timeout);
rxrpc_get_peer(peer);
rxrpc_get_connection(conn);
rxrpc_krxtimod_del_timer(&conn->timeout);
@@
-397,7
+398,7
@@
void rxrpc_put_connection(struct rxrpc_connection *conn)
}
/* move to graveyard queue */
}
/* move to graveyard queue */
- _debug("burying connection: {%08x}",
hton
l(conn->conn_id));
+ _debug("burying connection: {%08x}",
ntoh
l(conn->conn_id));
list_del(&conn->link);
list_add_tail(&conn->link, &peer->conn_graveyard);
list_del(&conn->link);
list_add_tail(&conn->link, &peer->conn_graveyard);
@@
-442,7
+443,7
@@
void rxrpc_conn_do_timeout(struct rxrpc_connection *conn)
}
_debug("--- Destroying Connection %p{%08x} ---",
}
_debug("--- Destroying Connection %p{%08x} ---",
- conn,
hton
l(conn->conn_id));
+ conn,
ntoh
l(conn->conn_id));
down_write(&rxrpc_conns_sem);
list_del(&conn->proc_link);
down_write(&rxrpc_conns_sem);
list_del(&conn->proc_link);
@@
-640,8
+641,8
@@
int rxrpc_conn_sendmsg(struct rxrpc_connection *conn,
_net("Sending message type %d of %Zd bytes to %08x:%d",
msg->hdr.type,
msg->dsize,
_net("Sending message type %d of %Zd bytes to %08x:%d",
msg->hdr.type,
msg->dsize,
-
hton
l(conn->addr.sin_addr.s_addr),
-
hton
s(conn->addr.sin_port));
+
ntoh
l(conn->addr.sin_addr.s_addr),
+
ntoh
s(conn->addr.sin_port));
/* send the message */
ret = kernel_sendmsg(conn->trans->socket, &msghdr,
/* send the message */
ret = kernel_sendmsg(conn->trans->socket, &msghdr,
@@
-699,11
+700,11
@@
int rxrpc_conn_receive_call_packet(struct rxrpc_connection *conn,
}
_proto("Received packet %%%u [%u] on call %hu:%u:%u",
}
_proto("Received packet %%%u [%u] on call %hu:%u:%u",
-
hton
l(msg->hdr.serial),
-
hton
l(msg->hdr.seq),
-
hton
s(msg->hdr.serviceId),
-
hton
l(conn->conn_id),
-
hton
l(call->call_id));
+
ntoh
l(msg->hdr.serial),
+
ntoh
l(msg->hdr.seq),
+
ntoh
s(msg->hdr.serviceId),
+
ntoh
l(conn->conn_id),
+
ntoh
l(call->call_id));
call->pkt_rcv_count++;
call->pkt_rcv_count++;