On Fri, 19 May 2017, Dan Jurgens wrote: > security/security.c | 385 ++++++++++++++++++++++ This looks wrong -- merge problem? > + if (pps->alt.state != IB_PORT_PKEY_NOT_VALID) { > + get_pkey_and_subnet_prefix(&pps->alt, > + &pkey, > + &subnet_prefix); > + > + ret = enforce_qp_pkey_security(pkey, > + subnet_prefix, > + sec); > + } > + > + if (ret) > + goto out; The above if/goto is unnecessary. > + > +out: > + return ret; > +} -- James Morris <jmorris@xxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html