[rds-commits] zab commits r111 - trunk/linux/net/rds

[svn-commits@oss.oracle.com]

Author: zab
Date: 2006-06-23 12:25:42 -0500 (Fri, 23 Jun 2006)
New Revision: 111

Modified:
   trunk/linux/net/rds/connection.c
   trunk/linux/net/rds/flow.c
   trunk/linux/net/rds/tcp.c
   trunk/linux/net/rds/transport.c
Log:
Fix up more endian mistakes.  These are hold-overs from when RDS/eth was
little-endian on the wire.


Modified: trunk/linux/net/rds/connection.c
===================================================================
--- trunk/linux/net/rds/connection.c	2006-06-21 22:57:57 UTC (rev 110)
+++ trunk/linux/net/rds/connection.c	2006-06-23 17:25:42 UTC (rev 111)
@@ -35,15 +35,15 @@
 struct hlist_head rds_conn_hash[RDS_CONNECTION_HASH_ENTRIES];
 static kmem_cache_t *rds_conn_slab;
 
-static struct hlist_head *rds_conn_bucket(__le32 laddr, __le32 faddr)
+static struct hlist_head *rds_conn_bucket(__be32 laddr, __be32 faddr)
 {
-	unsigned long hash = inet_ehashfn(le32_to_cpu(laddr), 0, 
-					  le32_to_cpu(faddr), 0);
+	unsigned long hash = inet_ehashfn(be32_to_cpu(laddr), 0, 
+					  be32_to_cpu(faddr), 0);
 	return &rds_conn_hash[hash & RDS_CONNECTION_HASH_MASK];
 }
 
 static struct rds_connection *rds_conn_lookup(struct hlist_head *head,
-					      __le32 laddr, __le32 faddr)
+					      __be32 laddr, __be32 faddr)
 {
 	struct rds_connection *conn, *ret = NULL;
 	struct hlist_node *pos;
@@ -104,7 +104,7 @@
  * For now they are not garbage collected once they're created.  They
  * are torn down as the module is removed, if ever.
  */
-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)
 {
 	struct rds_connection *conn, *tmp;

Modified: trunk/linux/net/rds/flow.c
===================================================================
--- trunk/linux/net/rds/flow.c	2006-06-21 22:57:57 UTC (rev 110)
+++ trunk/linux/net/rds/flow.c	2006-06-23 17:25:42 UTC (rev 111)
@@ -33,19 +33,19 @@
 struct hlist_head rds_flow_hash[RDS_FLOW_HASH_ENTRIES];
 static kmem_cache_t *rds_flow_slab;
 
-static struct hlist_head *rds_flow_bucket(__le32 laddr, __le16 lport,
-					  __le32 faddr, __le16 fport)
+static struct hlist_head *rds_flow_bucket(__be32 laddr, __be16 lport,
+					  __be32 faddr, __be16 fport)
 {
-	unsigned long hash = inet_ehashfn(le32_to_cpu(laddr),
-					  le16_to_cpu(lport),
-					  le32_to_cpu(faddr),
-					  le16_to_cpu(fport));
+	unsigned long hash = inet_ehashfn(be32_to_cpu(laddr),
+					  be16_to_cpu(lport),
+					  be32_to_cpu(faddr),
+					  be16_to_cpu(fport));
 	return &rds_flow_hash[hash & RDS_FLOW_HASH_MASK];
 }
 
 static struct rds_flow *rds_flow_lookup(struct hlist_head *head,
-						    __le32 laddr, __le16 lport,
-						    __le32 faddr, __le16 fport)
+						    __be32 laddr, __be16 lport,
+						    __be32 faddr, __be16 fport)
 {
 	struct rds_flow *flow, *ret = NULL;
 	struct hlist_node *pos;
@@ -70,8 +70,8 @@
 	atomic_inc(&flow->f_refcount);
 }
 
-struct rds_flow *rds_flow_get(__le32 laddr, __le16 lport, __le32 faddr,
-			      __le16 fport)
+struct rds_flow *rds_flow_get(__be32 laddr, __be16 lport, __be32 faddr,
+			      __be16 fport)
 {
 	struct rds_flow *flow;
 	unsigned long flags;
@@ -87,8 +87,8 @@
 }
 
 /* allocates if it isn't found, returns PTR_ERR */
-struct rds_flow *rds_flow_create(__le32 laddr, __le16 lport, __le32 faddr,
-				 __le16 fport, gfp_t gfp)
+struct rds_flow *rds_flow_create(__be32 laddr, __be16 lport, __be32 faddr,
+				 __be16 fport, gfp_t gfp)
 {
 	struct rds_flow *flow, *tmp;
 	struct rds_sock *rs = NULL;

Modified: trunk/linux/net/rds/tcp.c
===================================================================
--- trunk/linux/net/rds/tcp.c	2006-06-21 22:57:57 UTC (rev 110)
+++ trunk/linux/net/rds/tcp.c	2006-06-23 17:25:42 UTC (rev 111)
@@ -102,7 +102,7 @@
 	write_unlock_bh(&sock->sk->sk_callback_lock);
 }
 
-static int rds_tcp_laddr_check(__le32 addr)
+static int rds_tcp_laddr_check(__be32 addr)
 {
 	if (inet_addr_type(addr) != RTN_LOCAL)
 		return -EADDRNOTAVAIL;

Modified: trunk/linux/net/rds/transport.c
===================================================================
--- trunk/linux/net/rds/transport.c	2006-06-21 22:57:57 UTC (rev 110)
+++ trunk/linux/net/rds/transport.c	2006-06-23 17:25:42 UTC (rev 111)
@@ -27,7 +27,7 @@
 	NULL,
 };
 
-struct rds_transport *rds_trans_get_preferred(__le32 addr)
+struct rds_transport *rds_trans_get_preferred(__be32 addr)
 {
 	struct rds_transport **trans;