sdp: add support to kernel 2.6.39-200.1.1.el5uek

Rename the MACROs inet_daddr and inet_rcv_saddr, since they exists in this
kernel.

Signed-off-by: Dotan Barak <dotanb@dev.mellanox.co.il>

diff --git a/drivers/infiniband/ulp/sdp/sdp.h b/drivers/infiniband/ulp/sdp/sdp.h
index 6213f794e54c34908e9e7c666fcfbd86506e7df0..76dea5de01fe7eb0996e0a6f586b8c5840c14ea5 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp.h
+++ b/drivers/infiniband/ulp/sdp/sdp.h
@@ -46,8 +46,8 @@
 #define inet_sport(sk) inet_sk(sk)->sport
 #define inet_dport(sk) inet_sk(sk)->dport
 #define inet_saddr(sk) inet_sk(sk)->saddr
-#define inet_daddr(sk) inet_sk(sk)->daddr
-#define inet_rcv_saddr(sk) inet_sk(sk)->rcv_saddr
+#define sdp_inet_daddr(sk) inet_sk(sk)->daddr
+#define sdp_inet_rcv_saddr(sk) inet_sk(sk)->rcv_saddr
 
 #define sk_ssk(ssk) ((struct sock *)ssk)
 

diff --git a/drivers/infiniband/ulp/sdp/sdp_cma.c b/drivers/infiniband/ulp/sdp/sdp_cma.c
index a6261f7ca66f3437412572cba1cea7bb64724453..c2799c0b60b0c57f65ef44530bafbff610c1b137 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_cma.c
+++ b/drivers/infiniband/ulp/sdp/sdp_cma.c
@@ -204,7 +204,7 @@ static int sdp_connect_handler(struct sock *sk, struct rdma_cm_id *id,
 
                if ((h->ipv_cap & HH_IPV_MASK) == HH_IPV4) {
                        /* V6 mapped */
-                       inet_daddr(child) = dst_addr->sin_addr.s_addr;
+                       sdp_inet_daddr(child) = dst_addr->sin_addr.s_addr;
                        ipv6_addr_set(&newnp->daddr, 0, 0, htonl(0x0000FFFF),
                                        h->src_addr.ip4.addr);
 
@@ -224,11 +224,11 @@ static int sdp_connect_handler(struct sock *sk, struct rdma_cm_id *id,
                        sdp_warn(child, "Bad IPV field: 0x%x\n", h->ipv_cap & HH_IPV_MASK);
                }
 
-               inet_daddr(child) =inet_saddr(child) = inet_rcv_saddr(child) = LOOPBACK4_IPV6;
+               sdp_inet_daddr(child) = inet_saddr(child) = sdp_inet_rcv_saddr(child) = LOOPBACK4_IPV6;
        } else
 #endif
        {
-               inet_daddr(child) = dst_addr->sin_addr.s_addr;
+               sdp_inet_daddr(child) = dst_addr->sin_addr.s_addr;
        }
 
 #ifdef SDP_SOCK_HISTORY
@@ -314,7 +314,7 @@ static int sdp_response_handler(struct sock *sk, struct rdma_cm_id *id,
 
        dst_addr = (struct sockaddr_in *)&id->route.addr.dst_addr;
        inet_dport(sk) = dst_addr->sin_port;
-       inet_daddr(sk) = dst_addr->sin_addr.s_addr;
+       sdp_inet_daddr(sk) = dst_addr->sin_addr.s_addr;
 
 #ifdef SDP_SOCK_HISTORY
        sdp_ssk_hist_rename(sk);
@@ -467,7 +467,7 @@ int sdp_cma_handler(struct rdma_cm_id *id, struct rdma_cm_event *event)
                        else
 #endif
                {
-                       inet_saddr(sk) = inet_rcv_saddr(sk) =
+                       inet_saddr(sk) = sdp_inet_rcv_saddr(sk) =
                                ((struct sockaddr_in *)&id->route.addr.src_addr)->sin_addr.s_addr;
                }
                memset(&conn_param, 0, sizeof conn_param);
@@ -560,7 +560,7 @@ int sdp_cma_handler(struct rdma_cm_id *id, struct rdma_cm_event *event)
                rc = -ECONNREFUSED;
                break;
        case RDMA_CM_EVENT_ESTABLISHED:
-               inet_saddr(sk) = inet_rcv_saddr(sk) =
+               inet_saddr(sk) = sdp_inet_rcv_saddr(sk) =
                        ((struct sockaddr_in *)&id->route.addr.src_addr)->sin_addr.s_addr;
                rc = sdp_connected_handler(sk);
                break;

diff --git a/drivers/infiniband/ulp/sdp/sdp_main.c b/drivers/infiniband/ulp/sdp/sdp_main.c
index 9287003e02b00d4f0698512bce5a281ee123cff8..3d29c576bc1a4d8c1af985f259d71773b10b0ffd 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_main.c
+++ b/drivers/infiniband/ulp/sdp/sdp_main.c
@@ -187,7 +187,7 @@ static int sdp_get_port(struct sock *sk, unsigned short snum)
 
                addr4->sin_family = AF_INET;
                addr4->sin_port = htons(snum);
-               addr4->sin_addr.s_addr = inet_rcv_saddr(sk);
+               addr4->sin_addr.s_addr = sdp_inet_rcv_saddr(sk);
 
                addr_len = sizeof(*addr4);
 

diff --git a/drivers/infiniband/ulp/sdp/sdp_proc.c b/drivers/infiniband/ulp/sdp/sdp_proc.c
index fa0a9875985aaf107b06320b87d7713c67538d98..b7127d938acc033e021d6edcad41382f424c14ab 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_proc.c
+++ b/drivers/infiniband/ulp/sdp/sdp_proc.c
@@ -150,8 +150,8 @@ static int sdp_v4_seq_show(struct seq_file *seq, int num, struct sock *sk)
        __u16 srcp;
        __u32 rx_queue, tx_queue;
 
-       dest = inet_daddr(sk);
-       src = inet_rcv_saddr(sk);
+       dest = sdp_inet_daddr(sk);
+       src = sdp_inet_rcv_saddr(sk);
        destp = ntohs(inet_dport(sk));
        srcp = ntohs(inet_sport(sk));
        uid = sock_i_uid(sk);