diff options
author | Joe Perches <joe@perches.com> | 2009-11-29 19:55:45 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-29 19:55:45 -0500 |
commit | f64f9e719261a87818dd192a3a2352e5b20fbd0f (patch) | |
tree | b2d5cbaef3df615295f6061d8c4d6a912690556c /net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | |
parent | 152b6a62aea2d43359dd37004e9c218bf7bdeb3b (diff) |
net: Move && and || to end of previous line
Not including net/atm/
Compiled tested x86 allyesconfig only
Added a > 80 column line or two, which I ignored.
Existing checkpatch plaints willfully, cheerfully ignored.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sunrpc/xprtrdma/svc_rdma_recvfrom.c')
-rw-r--r-- | net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c index 9e884383134f..f92e37eb413c 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | |||
@@ -337,10 +337,9 @@ static int rdma_set_ctxt_sge(struct svcxprt_rdma *xprt, | |||
337 | 337 | ||
338 | static int rdma_read_max_sge(struct svcxprt_rdma *xprt, int sge_count) | 338 | static int rdma_read_max_sge(struct svcxprt_rdma *xprt, int sge_count) |
339 | { | 339 | { |
340 | if ((RDMA_TRANSPORT_IWARP == | 340 | if ((rdma_node_get_transport(xprt->sc_cm_id->device->node_type) == |
341 | rdma_node_get_transport(xprt->sc_cm_id-> | 341 | RDMA_TRANSPORT_IWARP) && |
342 | device->node_type)) | 342 | sge_count > 1) |
343 | && sge_count > 1) | ||
344 | return 1; | 343 | return 1; |
345 | else | 344 | else |
346 | return min_t(int, sge_count, xprt->sc_max_sge); | 345 | return min_t(int, sge_count, xprt->sc_max_sge); |