From: Amir Vadai Date: Sun, 20 Mar 2011 16:37:16 +0000 (+0200) Subject: sdp: Removed spaces and tabs at end of lines X-Git-Tag: v4.1.12-92~264^2~5^2~19 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=170962a6992cea228adf9d5e0be5fae5974c8c35;p=users%2Fjedix%2Flinux-maple.git sdp: Removed spaces and tabs at end of lines Signed-off-by: Amir Vadai --- diff --git a/drivers/infiniband/ulp/sdp/sdp_bcopy.c b/drivers/infiniband/ulp/sdp/sdp_bcopy.c index 1bb367bc17e76..2304bebf42331 100644 --- a/drivers/infiniband/ulp/sdp/sdp_bcopy.c +++ b/drivers/infiniband/ulp/sdp/sdp_bcopy.c @@ -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", diff --git a/drivers/infiniband/ulp/sdp/sdp_cma.c b/drivers/infiniband/ulp/sdp/sdp_cma.c index 39b2792a57e09..09bd41c3e662b 100644 --- a/drivers/infiniband/ulp/sdp/sdp_cma.c +++ b/drivers/infiniband/ulp/sdp/sdp_cma.c @@ -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; diff --git a/drivers/infiniband/ulp/sdp/sdp_main.c b/drivers/infiniband/ulp/sdp/sdp_main.c index 023d92a40b249..e441aecabd65c 100644 --- a/drivers/infiniband/ulp/sdp/sdp_main.c +++ b/drivers/infiniband/ulp/sdp/sdp_main.c @@ -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); diff --git a/drivers/infiniband/ulp/sdp/sdp_rx.c b/drivers/infiniband/ulp/sdp/sdp_rx.c index 3d054d6dc5006..704066572f754 100644 --- a/drivers/infiniband/ulp/sdp/sdp_rx.c +++ b/drivers/infiniband/ulp/sdp/sdp_rx.c @@ -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; diff --git a/drivers/infiniband/ulp/sdp/sdp_tx.c b/drivers/infiniband/ulp/sdp/sdp_tx.c index a14e886e7271a..55aa14e451d8a 100644 --- a/drivers/infiniband/ulp/sdp/sdp_tx.c +++ b/drivers/infiniband/ulp/sdp/sdp_tx.c @@ -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); diff --git a/drivers/infiniband/ulp/sdp/sdp_zcopy.c b/drivers/infiniband/ulp/sdp/sdp_zcopy.c index f661e238585c3..15c7acaf6484c 100644 --- a/drivers/infiniband/ulp/sdp/sdp_zcopy.c +++ b/drivers/infiniband/ulp/sdp/sdp_zcopy.c @@ -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;