mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflict was two parallel additions of include files to sch_generic.c, no biggie. Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
commit
51e18a453f
753 changed files with 7219 additions and 4574 deletions
|
|
@ -183,7 +183,7 @@ static int __rds_rdma_map(struct rds_sock *rs, struct rds_get_mr_args *args,
|
|||
long i;
|
||||
int ret;
|
||||
|
||||
if (rs->rs_bound_addr == 0) {
|
||||
if (rs->rs_bound_addr == 0 || !rs->rs_transport) {
|
||||
ret = -ENOTCONN; /* XXX not a great errno */
|
||||
goto out;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue