]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
sdp: Removed spaces and tabs at end of lines
authorAmir Vadai <amirv@mellanox.co.il>
Sun, 20 Mar 2011 16:37:16 +0000 (18:37 +0200)
committerMukesh Kacker <mukesh.kacker@oracle.com>
Tue, 6 Oct 2015 12:05:48 +0000 (05:05 -0700)
Signed-off-by: Amir Vadai <amirv@mellanox.co.il>
drivers/infiniband/ulp/sdp/sdp_bcopy.c
drivers/infiniband/ulp/sdp/sdp_cma.c
drivers/infiniband/ulp/sdp/sdp_main.c
drivers/infiniband/ulp/sdp/sdp_rx.c
drivers/infiniband/ulp/sdp/sdp_tx.c
drivers/infiniband/ulp/sdp/sdp_zcopy.c

index 1bb367bc17e7653d6b8f3a456a84d5b3d753725f..2304bebf42331ad483177872d77b24a7afb410ed 100644 (file)
@@ -211,7 +211,7 @@ again:
                        sdp_arm_rx_cq(sk);
        }
 
-       if (unlikely((ssk->sa_post_rdma_rd_compl || ssk->sa_post_sendsm) && 
+       if (unlikely((ssk->sa_post_rdma_rd_compl || ssk->sa_post_sendsm) &&
                        tx_credits(ssk) < SDP_MIN_TX_CREDITS)) {
                sdp_dbg_data(sk, "Run out of credits, can't abort SrcAvail. "
                        "RdmaRdCompl: %d SendSm: %d\n",
index 39b2792a57e09bf7d1cf301f3ed29cfc4b3bee1a..09bd41c3e662b9b20edb7d1bb9f38404d27d48b5 100644 (file)
@@ -192,7 +192,7 @@ static int sdp_connect_handler(struct sock *sk, struct rdma_cm_id *id,
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
        if (inet6_sk(sk)) {
                struct ipv6_pinfo *newnp;
-              
+
                newnp = inet_sk(child)->pinet6 = sdp_inet6_sk_generic(child);
 
                memcpy(newnp, inet6_sk(sk), sizeof(struct ipv6_pinfo));
@@ -209,7 +209,7 @@ static int sdp_connect_handler(struct sock *sk, struct rdma_cm_id *id,
                        ipv6_addr_copy(&newnp->rcv_saddr, &newnp->saddr);
                } else if ((h->ipv_cap & HH_IPV_MASK) == HH_IPV6) {
                        struct sockaddr_in6 *dst_addr6 = (struct sockaddr_in6 *)dst_addr;
-                       struct sockaddr_in6 *src_addr6 = 
+                       struct sockaddr_in6 *src_addr6 =
                                (struct sockaddr_in6 *)&id->route.addr.src_addr;
 
                        ipv6_addr_copy(&newnp->daddr, &dst_addr6->sin6_addr);
@@ -220,7 +220,7 @@ static int sdp_connect_handler(struct sock *sk, struct rdma_cm_id *id,
                }
 
                inet_daddr(child) =inet_saddr(child) = inet_rcv_saddr(child) = LOOPBACK4_IPV6;
-       } else 
+       } else
 #endif
        {
                inet_daddr(child) = dst_addr->sin_addr.s_addr;
@@ -436,7 +436,7 @@ int sdp_cma_handler(struct rdma_cm_id *id, struct rdma_cm_event *event)
                hh.bsdh.mid = SDP_MID_HELLO;
                hh.bsdh.len = htonl(sizeof(struct sdp_hh));
                hh.max_adverts = 1;
-       
+
                hh.majv_minv = SDP_MAJV_MINV;
                sdp_init_buffers(sdp_sk(sk), rcvbuf_initial_size);
                hh.bsdh.bufs = htons(rx_ring_posted(sdp_sk(sk)));
@@ -459,7 +459,7 @@ int sdp_cma_handler(struct rdma_cm_id *id, struct rdma_cm_event *event)
                        }
                        inet6_sk(sk)->saddr = inet6_sk(sk)->rcv_saddr;
                }
-                       else 
+                       else
 #endif
                {
                        inet_saddr(sk) = inet_rcv_saddr(sk) =
@@ -489,7 +489,7 @@ int sdp_cma_handler(struct rdma_cm_id *id, struct rdma_cm_event *event)
        case RDMA_CM_EVENT_ALT_ROUTE_ERROR:
                sdp_warn(sk, "alt route resolve error\n");
                break;
-               
+
        case RDMA_CM_EVENT_ROUTE_ERROR:
                rc = -ETIMEDOUT;
                break;
index 023d92a40b249991bf4d1032f5573b6ec78459cd..e441aecabd65c4dc489e7ed95e70d7d85a1307e9 100644 (file)
@@ -181,7 +181,7 @@ static int sdp_get_port(struct sock *sk, unsigned short snum)
                        addr_len = sizeof(*addr6);
                }
        }
-               else 
+               else
 #endif
        {
 
@@ -588,8 +588,8 @@ static void sdp_destruct(struct sock *sk)
        sk_mem_reclaim(sk);
 
        if (sk->sk_wmem_queued || atomic_read(&sk->sk_rmem_alloc) || sk->sk_forward_alloc) {
-               sdp_warn(sk, "wmem_queued: 0x%x rmem_alloc: 0x%x forward: 0x%x proto: 0x%x\n", 
-                               sk->sk_wmem_queued, atomic_read(&sk->sk_rmem_alloc), sk->sk_forward_alloc,  
+               sdp_warn(sk, "wmem_queued: 0x%x rmem_alloc: 0x%x forward: 0x%x proto: 0x%x\n",
+                               sk->sk_wmem_queued, atomic_read(&sk->sk_rmem_alloc), sk->sk_forward_alloc,
                                atomic_read(sk->sk_prot->memory_allocated));
        }
 
@@ -803,7 +803,7 @@ static int sdp_ipv6_connect(struct sock *sk, struct sockaddr_storage *saddr,
        int rc;
        int addr_type;
 
-       if (addr_len < SIN6_LEN_RFC2133) 
+       if (addr_len < SIN6_LEN_RFC2133)
                return -EINVAL;
 
        if (uaddr->sa_family == AF_INET6_SDP)
@@ -816,7 +816,7 @@ static int sdp_ipv6_connect(struct sock *sk, struct sockaddr_storage *saddr,
         *      connect() to INADDR_ANY means loopback (BSD'ism).
         */
        if(ipv6_addr_any(&usin->sin6_addr))
-               usin->sin6_addr.s6_addr[15] = 0x1; 
+               usin->sin6_addr.s6_addr[15] = 0x1;
 
        addr_type = ipv6_addr_type(&usin->sin6_addr);
 
@@ -870,7 +870,7 @@ static int sdp_ipv6_connect(struct sock *sk, struct sockaddr_storage *saddr,
 }
 #endif
 
-static int sdp_ipv4_connect(struct sock *sk, struct sockaddr_storage *saddr, 
+static int sdp_ipv4_connect(struct sock *sk, struct sockaddr_storage *saddr,
                struct sockaddr *uaddr, int addr_len)
 {
        struct sdp_sock *ssk = sdp_sk(sk);
@@ -1452,7 +1452,7 @@ static int sdp_setsockopt(struct sock *sk, int level, int optname,
                }
                break;
        case SDP_ZCOPY_THRESH:
-               if (val != 0 && (val < SDP_MIN_ZCOPY_THRESH || 
+               if (val != 0 && (val < SDP_MIN_ZCOPY_THRESH ||
                                        val > SDP_MAX_ZCOPY_THRESH))
                        err = -EINVAL;
                else
@@ -1523,7 +1523,7 @@ static int sdp_getsockopt(struct sock *sk, int level, int optname,
 static inline int cycles_before(cycles_t a, cycles_t b)
 {
        /* cycles_t is unsigned, but may be int/long/long long. */
-        
+
        if (sizeof(cycles_t) == 4)
                return before(a, b);
        else
@@ -2460,7 +2460,7 @@ out:
        posts_handler_put(ssk, SDP_RX_ARMING_DELAY);
 
        sdp_auto_moderation(ssk);
-       
+
        if (!err && !ssk->qp_active) {
                err = -EPIPE;
                sdp_set_error(sk, err);
index 3d054d6dc5006e648f22cfb7aefb1aeca561e8c7..704066572f754b4ef55b144f0a4e3c744b76db7c 100644 (file)
@@ -431,7 +431,7 @@ static void sdp_reuse_sdp_buf(struct sdp_sock *ssk, struct sdp_buf *sbuf, int le
                        int count = min(PAGE_SIZE, SDP_MAX_PAYLOAD) *
                                (skb_shinfo(skb)->nr_frags - i);
                        skb->truesize -= count;
-                       
+
                        skb_shinfo(skb)->nr_frags = i;
                        bytes_reused += count;
                        break;
index a14e886e7271ad4587a8bf6d5add733b5f4ed12a..55aa14e451d8a9ed399d2891b7649381480e3288 100644 (file)
@@ -87,8 +87,8 @@ void sdp_post_send(struct sdp_sock *ssk, struct sk_buff *skb)
 
        ssk->tx_packets++;
 
-       if (h->mid != SDP_MID_SRCAVAIL && 
-                       h->mid != SDP_MID_DATA && 
+       if (h->mid != SDP_MID_SRCAVAIL &&
+                       h->mid != SDP_MID_DATA &&
                        h->mid != SDP_MID_SRCAVAIL_CANCEL) {
                struct sock *sk = sk_ssk(ssk);
 
@@ -257,7 +257,7 @@ static inline void sdp_process_tx_wc(struct sdp_sock *ssk, struct ib_wc *wc)
        if (likely(!wc->status) || wc->status == IB_WC_WR_FLUSH_ERR)
                return;
 
-       sdp_warn(sk, "Send completion with error. wr_id 0x%llx Status %d\n", 
+       sdp_warn(sk, "Send completion with error. wr_id 0x%llx Status %d\n",
                        wc->wr_id, wc->status);
 
        sdp_set_error(sk, -ECONNRESET);
index f661e238585c306e49d7a334ad74fd1dbca3f4a2..15c7acaf6484c634754dedad18de3486aaaa9090 100644 (file)
@@ -448,7 +448,7 @@ static int sdp_alloc_fmr(struct sock *sk, void *uaddr, size_t len,
                        unsigned len2;
                        len2 = ib_sg_dma_len(dev,
                                        &chunk->page_list[j]) >> PAGE_SHIFT;
-                       
+
                        SDP_WARN_ON(len2 > len);
                        len -= len2;