Merge branch 'master' into next

[mirror_iproute2.git] / rdma / res-mr.c

diff --git a/rdma/res-mr.c b/rdma/res-mr.c
index f4a24dc1e7cf4e794d28e1af8365859b4afcfb49..c1b8069abbfeaa72e4a5c52c0516e37133fce388 100644 (file)
--- a/rdma/res-mr.c
+++ b/rdma/res-mr.c
@@ -17,11 +17,8 @@ static int res_mr_line(struct rd *rd, const char *name, int idx,
        uint32_t mrn = 0;
        uint32_t pid = 0;
 
-       if (!nla_line[RDMA_NLDEV_ATTR_RES_MRLEN] ||
-           (!nla_line[RDMA_NLDEV_ATTR_RES_PID] &&
-            !nla_line[RDMA_NLDEV_ATTR_RES_KERN_NAME])) {
+       if (!nla_line[RDMA_NLDEV_ATTR_RES_MRLEN])
                return MNL_CB_ERROR;
-       }
 
        if (nla_line[RDMA_NLDEV_ATTR_RES_RKEY])
                rkey = mnl_attr_get_u32(nla_line[RDMA_NLDEV_ATTR_RES_RKEY]);