-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* Copyright (C) 2009-2012 Cray, Inc.
+ *
+ * Copyright (c) 2014, Intel Corporation.
+ *
* Author: Nic Henke <nic@cray.com>, James Shimek <jshimek@cray.com>
*
* This file is part of Lustre, http://www.lustre.org.
#ifndef _GNILND_ARIES_H
#define _GNILND_ARIES_H
-/* for libcfs_ipif_query */
-#include <libcfs/libcfs.h>
+/* for lnet_ipif_query */
+#include <lnet/lib-lnet.h>
#ifndef _GNILND_HSS_OPS_H
# error "must include gnilnd_hss_ops.h first"
#else
#define GNILND_REVERSE_RDMA GNILND_REVERSE_GET
#define GNILND_RDMA_DLVR_OPTION GNI_DLVMODE_PERFORMANCE
+#define GNILND_SCHED_THREADS 7 /* scheduler threads */
#endif
+/* Thread-safe kgni implemented in minor ver 45, code rev 0xb9 */
+#define GNILND_KGNI_TS_MINOR_VER 0x45
+
/* plug in our functions for use on the simulator */
#if !defined(GNILND_USE_RCA)
return -EINVAL;
}
if (nid < kgnilnd_data.kgn_nid_trans_private) {
- CERROR("Request for invalid nid translation %u, minimum %Lu\n",
+ CERROR("Request for invalid nid translation %u,"
+ "minimum "LPU64"\n",
nid, kgnilnd_data.kgn_nid_trans_private);
return -ESRCH;
}
LCONSOLE_INFO("using Aries SIM IP info for RCA translation\n");
- rc = libcfs_ipif_query(if_name, &up, &ipaddr, &netmask);
+ rc = lnet_ipif_query(if_name, &up, &ipaddr, &netmask);
if (rc != 0) {
CERROR ("can't get IP interface for %s: %d\n", if_name, rc);
return rc;