OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[uclinux-h8/linux.git]
/
net
/
sunrpc
/
xprtrdma
/
svc_rdma_transport.c
diff --git
a/net/sunrpc/xprtrdma/svc_rdma_transport.c
b/net/sunrpc/xprtrdma/svc_rdma_transport.c
index
547b2cd
..
2848caf
100644
(file)
--- a/
net/sunrpc/xprtrdma/svc_rdma_transport.c
+++ b/
net/sunrpc/xprtrdma/svc_rdma_transport.c
@@
-296,7
+296,6
@@
static int rdma_listen_handler(struct rdma_cm_id *cma_id,
struct rdma_cm_event *event)
{
struct sockaddr *sap = (struct sockaddr *)&cma_id->route.addr.src_addr;
- int ret = 0;
trace_svcrdma_cm_event(event, sap);
@@
-315,7
+314,7
@@
static int rdma_listen_handler(struct rdma_cm_id *cma_id,
break;
}
- return
ret
;
+ return
0
;
}
static int rdma_cma_handler(struct rdma_cm_id *cma_id,