[rds-commits] jlbec commits r101 - trunk/linux/net/rds

[svn-commits@oss.oracle.com]

Author: jlbec
Date: 2006-06-07 16:03:38 -0500 (Wed, 07 Jun 2006)
New Revision: 101

Modified:
   trunk/linux/net/rds/bind.c
   trunk/linux/net/rds/rds.h
Log:

net/rds: Change bound addresses to network byte order.

Signed-off-by: Joel Becker <joel.becker at oracle.com>



Modified: trunk/linux/net/rds/bind.c
===================================================================
--- trunk/linux/net/rds/bind.c	2006-06-07 20:35:04 UTC (rev 100)
+++ trunk/linux/net/rds/bind.c	2006-06-07 21:03:38 UTC (rev 101)
@@ -63,20 +63,20 @@
 static spinlock_t rds_bind_lock = SPIN_LOCK_UNLOCKED;
 struct rb_root rds_bind_tree = RB_ROOT;
 
-static struct rds_sock *rds_bind_tree_walk(__le32 addr, __le16 port,
+static struct rds_sock *rds_bind_tree_walk(__be32 addr, __be16 port,
 					   struct rds_sock *insert)
 {
 	struct rb_node **p = &rds_bind_tree.rb_node;
 	struct rb_node *parent = NULL;
 	struct rds_sock *rs;
-	u64 cmp,needle = ((u64)le32_to_cpu(addr) << 32) | le16_to_cpu(port);
+	u64 cmp,needle = ((u64)be32_to_cpu(addr) << 32) | be16_to_cpu(port);
 
 	while (*p) {
 		parent = *p;
 		rs = rb_entry(parent, struct rds_sock, rs_bound_node);
 
-		cmp = ((u64)le32_to_cpu(rs->rs_bound_addr) << 32) |
-		      le16_to_cpu(rs->rs_bound_port);
+		cmp = ((u64)be32_to_cpu(rs->rs_bound_addr) << 32) |
+		      be16_to_cpu(rs->rs_bound_port);
 
 		if (needle < cmp)
 			p = &(*p)->rb_left;
@@ -101,7 +101,7 @@
  * return the rds_sock so that our caller doesn't get a chance to create
  * a flow after rds_release() has purged them.
  */
-struct rds_sock *rds_find_bound(__le32 addr, __le16 port)
+struct rds_sock *rds_find_bound(__be32 addr, __be16 port)
 {
 	struct rds_sock *rs;
 	unsigned long flags;
@@ -118,14 +118,14 @@
 }
 
 /* returns -ve errno or +ve port */
-int rds_add_bound(struct rds_sock *rs, __le32 addr, __le16 *port)
+int rds_add_bound(struct rds_sock *rs, __be32 addr, __be16 *port)
 {
 	unsigned long flags;
 	int ret = -EADDRINUSE;
 	u16 rover, last;
 
 	if (*port != 0) {
-		rover = le16_to_cpu(*port);
+		rover = be16_to_cpu(*port);
 		last = rover;
 	} else {
 		rover = max_t(u16, net_random(), 2);
@@ -137,8 +137,8 @@
 	do {
 		if (rover == 0)
 			rover++;
-		if (rds_bind_tree_walk(addr, cpu_to_le16(rover), rs) == NULL) {
-			*port = cpu_to_le16(rover);
+		if (rds_bind_tree_walk(addr, cpu_to_be16(rover), rs) == NULL) {
+			*port = cpu_to_be16(rover);
 			ret = 0;
 			break;
 		}

Modified: trunk/linux/net/rds/rds.h
===================================================================
--- trunk/linux/net/rds/rds.h	2006-06-07 20:35:04 UTC (rev 100)
+++ trunk/linux/net/rds/rds.h	2006-06-07 21:03:38 UTC (rev 101)
@@ -163,9 +163,9 @@
 	 * support.
 	 */
 	struct rb_node		rs_bound_node;
-	__le32			rs_bound_addr;
+	__be32			rs_bound_addr;
 	__be32			rs_conn_addr;
-	__le16			rs_bound_port;
+	__be16			rs_bound_port;
 	__be16			rs_conn_port;
 
 	struct list_head	rs_flow_list;
@@ -237,12 +237,12 @@
 /* bind.c */
 int rds_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len);
 void rds_remove_bound(struct rds_sock *rs);
-struct rds_sock *rds_find_bound(__le32 addr, __le16 port);
+struct rds_sock *rds_find_bound(__be32 addr, __be16 port);
 
 /* conn.c */
 int __init rds_conn_init(void);
 void __exit rds_conn_exit(void);
-struct rds_connection *rds_conn_create(__le32 laddr, __le32 faddr,
+struct rds_connection *rds_conn_create(__be32 laddr, __be32 faddr,
 				       struct rds_transport *trans, gfp_t gfp);
 void rds_conn_reset(struct rds_connection *conn);
 
@@ -252,10 +252,10 @@
 void rds_flow_put(struct rds_flow *flow);
 void rds_flow_drop_upto_seq(struct rds_flow *flow, u64 seq);
 void rds_flow_drop_from_sock(struct rds_sock *rs);
-struct rds_flow *rds_flow_get(__le32 laddr, __le16 lport, __le32 faddr,
-			      __le16 fport);
-struct rds_flow *rds_flow_create(__le32 laddr, __le16 lport, __le32 faddr,
-				 __le16 fport, gfp_t gfp);
+struct rds_flow *rds_flow_get(__be32 laddr, __be16 lport, __be32 faddr,
+			      __be16 fport);
+struct rds_flow *rds_flow_create(__be32 laddr, __be16 lport, __be32 faddr,
+				 __be16 fport, gfp_t gfp);
 
 /* message.c */
 struct rds_message *rds_message_copy_from_user(struct iovec *first_iov,
@@ -314,7 +314,7 @@
 void __exit rds_tcp_exit(void);
 
 /* transport.c */
-struct rds_transport *rds_trans_get_preferred(__le32 addr);
+struct rds_transport *rds_trans_get_preferred(__be32 addr);
 void rds_trans_send(struct rds_connection *conn);
 void rds_trans_stop_listening(void);
 int __init rds_trans_init(void);