Update libibmad to git commit 4a55423059e76ccba95aed36dd256510082b1e27. We update MAD_EXPORT to __declspec(dllimport) unless it has been defined. Applications including mad.h will now get the imported functions and variables, but libibmad will define MAD_EXPORT to export the calls. This change was needed to export/import ibdebug across library boundaries.
Signed-off-by: Sean Hefty <[email protected]> --- Index: ulp/libibmad/include/infiniband/mad.h =================================================================== --- ulp/libibmad/include/infiniband/mad.h (revision 2812) +++ ulp/libibmad/include/infiniband/mad.h (working copy) @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2007 Voltaire Inc. All rights reserved. + * Copyright (c) 2004-2009 Voltaire Inc. All rights reserved. * Copyright (c) 2009 HNR Consulting. All rights reserved. * Copyright (c) 2009 Mellanox Technologies LTD. All rights reserved. * @@ -168,6 +168,8 @@ IB_GSI_PORT_SAMPLES_CONTROL = 0x10, IB_GSI_PORT_SAMPLES_RESULT = 0x11, IB_GSI_PORT_COUNTERS = 0x12, + IB_GSI_PORT_RCV_ERROR_DETAILS = 0x15, + IB_GSI_PORT_XMIT_DISCARD_DETAILS = 0x16, IB_GSI_PORT_COUNTERS_EXT = 0x1D, IB_GSI_PORT_XMIT_DATA_SL = 0x36, IB_GSI_PORT_RCV_DATA_SL = 0x37, @@ -356,6 +358,7 @@ IB_PORT_QKEY_VIOL_F, IB_PORT_GUID_CAP_F, IB_PORT_CLIENT_REREG_F, + IB_PORT_MCAST_PKEY_SUPR_ENAB_F, IB_PORT_SUBN_TIMEOUT_F, IB_PORT_RESP_TIME_VAL_F, IB_PORT_LOCAL_PHYS_ERR_F, @@ -604,6 +607,9 @@ IB_CPI_TRAP_QP_F, IB_CPI_TRAP_QKEY_F, + /* + * PortXmitDataSL fields + */ IB_PC_XMT_DATA_SL_FIRST_F, IB_PC_XMT_DATA_SL0_F = IB_PC_XMT_DATA_SL_FIRST_F, IB_PC_XMT_DATA_SL1_F, @@ -623,6 +629,9 @@ IB_PC_XMT_DATA_SL15_F, IB_PC_XMT_DATA_SL_LAST_F, + /* + * PortRcvDataSL fields + */ IB_PC_RCV_DATA_SL_FIRST_F, IB_PC_RCV_DATA_SL0_F = IB_PC_RCV_DATA_SL_FIRST_F, IB_PC_RCV_DATA_SL1_F, @@ -642,6 +651,61 @@ IB_PC_RCV_DATA_SL15_F, IB_PC_RCV_DATA_SL_LAST_F, + /* + * PortXmitDiscardDetails fields + */ + IB_PC_XMT_INACT_DISC_F, + IB_PC_XMT_NEIGH_MTU_DISC_F, + IB_PC_XMT_SW_LIFE_DISC_F, + IB_PC_XMT_SW_HOL_DISC_F, + IB_PC_XMT_DISC_LAST_F, + + /* + * PortRcvErrorDetails fields + */ + IB_PC_RCV_LOCAL_PHY_ERR_F, + IB_PC_RCV_MALFORMED_PKT_ERR_F, + IB_PC_RCV_BUF_OVR_ERR_F, + IB_PC_RCV_DLID_MAP_ERR_F, + IB_PC_RCV_VL_MAP_ERR_F, + IB_PC_RCV_LOOPING_ERR_F, + IB_PC_RCV_ERR_LAST_F, + + /* + * PortSamplesControl fields + */ + IB_PSC_OPCODE_F, + IB_PSC_PORT_SELECT_F, + IB_PSC_TICK_F, + IB_PSC_COUNTER_WIDTH_F, + IB_PSC_COUNTER_MASK0_F, + IB_PSC_COUNTER_MASKS1TO9_F, + IB_PSC_COUNTER_MASKS10TO14_F, + IB_PSC_SAMPLE_MECHS_F, + IB_PSC_SAMPLE_STATUS_F, + IB_PSC_OPTION_MASK_F, + IB_PSC_VENDOR_MASK_F, + IB_PSC_SAMPLE_START_F, + IB_PSC_SAMPLE_INTVL_F, + IB_PSC_TAG_F, + IB_PSC_COUNTER_SEL0_F, + IB_PSC_COUNTER_SEL1_F, + IB_PSC_COUNTER_SEL2_F, + IB_PSC_COUNTER_SEL3_F, + IB_PSC_COUNTER_SEL4_F, + IB_PSC_COUNTER_SEL5_F, + IB_PSC_COUNTER_SEL6_F, + IB_PSC_COUNTER_SEL7_F, + IB_PSC_COUNTER_SEL8_F, + IB_PSC_COUNTER_SEL9_F, + IB_PSC_COUNTER_SEL10_F, + IB_PSC_COUNTER_SEL11_F, + IB_PSC_COUNTER_SEL12_F, + IB_PSC_COUNTER_SEL13_F, + IB_PSC_COUNTER_SEL14_F, + IB_PSC_SAMPLES_ONLY_OPT_MASK_F, + IB_PSC_LAST_F, + IB_FIELD_LAST_ /* must be last */ }; @@ -963,10 +1027,15 @@ mad_dump_node_type, mad_dump_sltovl, mad_dump_vlarbitration, mad_dump_nodedesc, mad_dump_nodeinfo, mad_dump_portinfo, mad_dump_switchinfo, mad_dump_perfcounters, mad_dump_perfcounters_ext, - mad_dump_perfcounters_xmt_sl, mad_dump_perfcounters_rcv_sl; + mad_dump_perfcounters_xmt_sl, mad_dump_perfcounters_rcv_sl, + mad_dump_perfcounters_xmt_disc, mad_dump_perfcounters_rcv_err, + mad_dump_portsamples_control; -MAD_EXPORT int ibdebug; +MAD_EXPORT void mad_dump_fields(char *buf, int bufsz, void *val, int valsz, + int start, int end); +extern MAD_EXPORT int ibdebug; + #if __BYTE_ORDER == __LITTLE_ENDIAN #ifndef ntohll static inline uint64_t ntohll(uint64_t x) @@ -1000,11 +1069,14 @@ #define ALIGN(l, size) (((l) + ((size) - 1)) / (size) * (size)) /** printf style warning MACRO, includes name of function and pid */ -#define IBWARN(fmt, ...) fprintf(stdout, "ibwarn: [%d] %s: " fmt "\n", getpid(), __func__, ## __VA_ARGS__) +#define IBWARN(fmt, ...) fprintf(stderr, "ibwarn: [%d] %s: " fmt "\n", getpid(), __func__, ## __VA_ARGS__) -/** printf style abort MACRO, includes name of function and pid */ +#define IBDEBUG(fmt, ...) fprintf(stdout, "ibdebug: [%d] %s: " fmt "\n", getpid(), __func__, ## __VA_ARGS__) + +#define IBVERBOSE(fmt, ...) fprintf(stdout, "[%d] %s: " fmt "\n", getpid(), __func__, ## __VA_ARGS__) + #define IBPANIC(fmt, ...) do { \ - fprintf(stdout, "ibpanic: [%d] %s: " fmt ": %m\n", getpid(), __func__, ## __VA_ARGS__); \ + fprintf(stderr, "ibpanic: [%d] %s: " fmt ": %m\n", getpid(), __func__, ## __VA_ARGS__); \ exit(-1); \ } while(0) Index: ulp/libibmad/include/infiniband/mad_osd.h =================================================================== --- ulp/libibmad/include/infiniband/mad_osd.h (revision 2812) +++ ulp/libibmad/include/infiniband/mad_osd.h (working copy) @@ -46,7 +46,12 @@ #define PRIo64 "I64o" #define PRIu64 "I64u" -#define MAD_EXPORT __declspec(dllexport) +#ifndef MAD_EXPORT +#define MAD_EXPORT __declspec(dllimport) +#endif +#ifndef IBND_EXPORT +#define IBND_EXPORT __declspec(dllimport) +#endif #define DEPRECATED Index: ulp/libibmad/include/windows/config.h =================================================================== --- ulp/libibmad/include/windows/config.h (revision 0) +++ ulp/libibmad/include/windows/config.h (revision 0) @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2010 Intel Corp, Inc. All rights reserved. + * + * This software is available to you under a choice of one of two + * licenses. You may choose to be licensed under the terms of the GNU + * General Public License (GPL) Version 2, available from the file + * COPYING in the main directory of this source tree, or the + * OpenIB.org BSD license below: + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + +#ifndef _CONFIG_H_ +#define _CONFIG_H_ + +#define MAD_EXPORT __declspec(dllexport) + +#endif /* _CONFIG_H_ */ Index: ulp/libibmad/src/bm.c =================================================================== --- ulp/libibmad/src/bm.c (revision 2812) +++ ulp/libibmad/src/bm.c (working copy) @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2007 Voltaire Inc. All rights reserved. + * Copyright (c) 2004-2009 Voltaire Inc. All rights reserved. * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU @@ -53,7 +53,11 @@ { ib_rpc_t rpc = { 0 }; int resp_expected; - char data_with_bkey[IB_BM_BKEY_AND_DATA_SZ] = { 0 }; + struct { + uint64_t bkey; + uint8_t reserved[32]; + uint8_t data[IB_BM_DATA_SZ]; + } bm_data; DEBUG("route %s data %p", portid2str(portid), data); if (portid->lid <= 0) { @@ -74,9 +78,9 @@ rpc.dataoffs = IB_BM_BKEY_OFFS; // copy data to a buffer which also includes the bkey - *((uint64_t *) data_with_bkey) = htonll(call->bkey); - memcpy(data_with_bkey + IB_BM_DATA_OFFS - IB_BM_BKEY_OFFS, data, - IB_BM_DATA_SZ); + bm_data.bkey = htonll(call->bkey); + memset(bm_data.reserved, 0, sizeof(bm_data.reserved)); + memcpy(bm_data.data, data, IB_BM_DATA_SZ); DEBUG ("method 0x%x attr 0x%x mod 0x%x datasz %d off %d res_ex %d bkey 0x%08x%08x", @@ -89,17 +93,15 @@ if (resp_expected) { /* FIXME: no RMPP for now */ - if (mad_rpc - (srcport, &rpc, portid, data_with_bkey, data_with_bkey)) + if (mad_rpc(srcport, &rpc, portid, &bm_data, &bm_data)) goto return_ok; return NULL; } - if (mad_send_via(&rpc, portid, 0, data_with_bkey, srcport) < 0) + if (mad_send_via(&rpc, portid, 0, &bm_data, srcport) < 0) return NULL; return_ok: - memcpy(data, data_with_bkey + IB_BM_DATA_OFFS - IB_BM_BKEY_OFFS, - IB_BM_DATA_SZ); + memcpy(data, bm_data.data, IB_BM_DATA_SZ); return data; } Index: ulp/libibmad/src/dump.c =================================================================== --- ulp/libibmad/src/dump.c (revision 2812) +++ ulp/libibmad/src/dump.c (working copy) @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2008 Voltaire Inc. All rights reserved. + * Copyright (c) 2004-2009 Voltaire Inc. All rights reserved. * Copyright (c) 2007 Xsigo Systems Inc. All rights reserved. * Copyright (c) 2009 Mellanox Technologies LTD. All rights reserved. * Copyright (c) 2009 HNR Consulting. All rights reserved. @@ -671,6 +671,12 @@ return (int)(s - buf); } +void mad_dump_fields(char *buf, int bufsz, void *val, int valsz, int start, + int end) +{ + _dump_fields(buf, bufsz, val, start, end); +} + void mad_dump_nodedesc(char *buf, int bufsz, void *val, int valsz) { strncpy(buf, val, bufsz); @@ -729,6 +735,31 @@ IB_PC_RCV_DATA_SL_LAST_F); } +void mad_dump_perfcounters_xmt_disc(char *buf, int bufsz, void *val, int valsz) +{ + int cnt; + + cnt = _dump_fields(buf, bufsz, val, IB_PC_EXT_PORT_SELECT_F, + IB_PC_EXT_XMT_BYTES_F); + _dump_fields(buf + cnt, bufsz - cnt, val, IB_PC_XMT_INACT_DISC_F, + IB_PC_XMT_DISC_LAST_F); +} + +void mad_dump_perfcounters_rcv_err(char *buf, int bufsz, void *val, int valsz) +{ + int cnt; + + cnt = _dump_fields(buf, bufsz, val, IB_PC_EXT_PORT_SELECT_F, + IB_PC_EXT_XMT_BYTES_F); + _dump_fields(buf + cnt, bufsz - cnt, val, IB_PC_RCV_LOCAL_PHY_ERR_F, + IB_PC_RCV_ERR_LAST_F); +} + +void mad_dump_portsamples_control(char *buf, int bufsz, void *val, int valsz) +{ + _dump_fields(buf, bufsz, val, IB_PSC_OPCODE_F, IB_PSC_LAST_F); +} + void xdump(FILE * file, char *msg, void *p, int size) { #define HEX(x) ((x) < 10 ? '0' + (x) : 'a' + ((x) -10)) Index: ulp/libibmad/src/fields.c =================================================================== --- ulp/libibmad/src/fields.c (revision 2812) +++ ulp/libibmad/src/fields.c (working copy) @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2007 Voltaire Inc. All rights reserved. + * Copyright (c) 2004-2009 Voltaire Inc. All rights reserved. * Copyright (c) 2009 HNR Consulting. All rights reserved. * Copyright (c) 2009 Mellanox Technologies LTD. All rights reserved. * @@ -162,6 +162,7 @@ {BITSOFFS(384, 16), "QkeyViolations", mad_dump_uint}, {BITSOFFS(400, 8), "GuidCap", mad_dump_uint}, {BITSOFFS(408, 1), "ClientReregister", mad_dump_uint}, + {BITSOFFS(409, 1), "McastPkeyTrapSuppressionEnabled", mad_dump_uint}, {BITSOFFS(411, 5), "SubnetTimeout", mad_dump_uint}, {BITSOFFS(419, 5), "RespTimeVal", mad_dump_uint}, {BITSOFFS(424, 4), "LocalPhysErr", mad_dump_uint}, @@ -406,6 +407,9 @@ {BITSOFFS(520, 24), "TrapQP", mad_dump_hex}, {544, 32, "TrapQKey", mad_dump_hex}, + /* + * PortXmitDataSL fields + */ {32, 32, "XmtDataSL0", mad_dump_uint}, {64, 32, "XmtDataSL1", mad_dump_uint}, {96, 32, "XmtDataSL2", mad_dump_uint}, @@ -424,6 +428,9 @@ {512, 32, "XmtDataSL15", mad_dump_uint}, {0, 0}, /* IB_PC_XMT_DATA_SL_LAST_F */ + /* + * PortRcvDataSL fields + */ {32, 32, "RcvDataSL0", mad_dump_uint}, {64, 32, "RcvDataSL1", mad_dump_uint}, {96, 32, "RcvDataSL2", mad_dump_uint}, @@ -442,6 +449,61 @@ {512, 32, "RcvDataSL15", mad_dump_uint}, {0, 0}, /* IB_PC_RCV_DATA_SL_LAST_F */ + /* + * PortXmitDiscardDetails fields + */ + {32, 16, "PortInactiveDiscards", mad_dump_uint}, + {48, 16, "PortNeighborMTUDiscards", mad_dump_uint}, + {64, 16, "PortSwLifetimeLimitDiscards", mad_dump_uint}, + {80, 16, "PortSwHOQLifetimeLimitDiscards", mad_dump_uint}, + {0, 0}, /* IB_PC_XMT_DISC_LAST_F */ + + /* + * PortRcvErrorDetails fields + */ + {32, 16, "PortLocalPhysicalErrors", mad_dump_uint}, + {48, 16, "PortMalformedPktErrors", mad_dump_uint}, + {64, 16, "PortBufferOverrunErrors", mad_dump_uint}, + {80, 16, "PortDLIDMappingErrors", mad_dump_uint}, + {96, 16, "PortVLMappingErrors", mad_dump_uint}, + {112, 16, "PortLoopingErrors", mad_dump_uint}, + {0, 0}, /* IB_PC_RCV_ERR_LAST_F */ + + /* + * PortSamplesControl fields + */ + {BITSOFFS(0, 8), "OpCode", mad_dump_hex}, + {BITSOFFS(8, 8), "PortSelect", mad_dump_uint}, + {BITSOFFS(16, 8), "Tick", mad_dump_hex}, + {BITSOFFS(29, 3), "CounterWidth", mad_dump_uint}, + {BITSOFFS(34, 3), "CounterMask0", mad_dump_hex}, + {BITSOFFS(37, 27), "CounterMasks1to9", mad_dump_hex}, + {BITSOFFS(65, 15), "CounterMasks10to14", mad_dump_hex}, + {BITSOFFS(80, 8), "SampleMechanisms", mad_dump_uint}, + {BITSOFFS(94, 2), "SampleStatus", mad_dump_uint}, + {96, 64, "OptionMask", mad_dump_hex}, + {160, 64, "VendorMask", mad_dump_hex}, + {224, 32, "SampleStart", mad_dump_uint}, + {256, 32, "SampleInterval", mad_dump_uint}, + {288, 16, "Tag", mad_dump_hex}, + {304, 16, "CounterSelect0", mad_dump_hex}, + {320, 16, "CounterSelect1", mad_dump_hex}, + {336, 16, "CounterSelect2", mad_dump_hex}, + {352, 16, "CounterSelect3", mad_dump_hex}, + {368, 16, "CounterSelect4", mad_dump_hex}, + {384, 16, "CounterSelect5", mad_dump_hex}, + {400, 16, "CounterSelect6", mad_dump_hex}, + {416, 16, "CounterSelect7", mad_dump_hex}, + {432, 16, "CounterSelect8", mad_dump_hex}, + {448, 16, "CounterSelect9", mad_dump_hex}, + {464, 16, "CounterSelect10", mad_dump_hex}, + {480, 16, "CounterSelect11", mad_dump_hex}, + {496, 16, "CounterSelect12", mad_dump_hex}, + {512, 16, "CounterSelect13", mad_dump_hex}, + {528, 16, "CounterSelect14", mad_dump_hex}, + {576, 64, "SamplesOnlyOptionMask", mad_dump_hex}, + {0, 0}, /* IB_PSC_LAST_F */ + {0, 0} /* IB_FIELD_LAST_ */ }; Index: ulp/libibmad/src/gs.c =================================================================== --- ulp/libibmad/src/gs.c (revision 2812) +++ ulp/libibmad/src/gs.c (working copy) @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2007 Voltaire Inc. All rights reserved. + * Copyright (c) 2004-2009 Voltaire Inc. All rights reserved. * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU Index: ulp/libibmad/src/libibmad.map =================================================================== --- ulp/libibmad/src/libibmad.map (revision 2812) +++ ulp/libibmad/src/libibmad.map (working copy) @@ -20,13 +20,17 @@ mad_dump_nodedesc; mad_dump_nodeinfo; mad_dump_opervls; + mad_dump_fields; mad_dump_perfcounters; mad_dump_perfcounters_ext; mad_dump_perfcounters_xmt_sl; mad_dump_perfcounters_rcv_sl; + mad_dump_perfcounters_xmt_disc; + mad_dump_perfcounters_rcv_err; mad_dump_physportstate; mad_dump_portcapmask; mad_dump_portinfo; + mad_dump_portsamples_control; mad_dump_portstates; mad_dump_portstate; mad_dump_rhex; Index: ulp/libibmad/src/mad.c =================================================================== --- ulp/libibmad/src/mad.c (revision 2812) +++ ulp/libibmad/src/mad.c (working copy) @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2007 Voltaire Inc. All rights reserved. + * Copyright (c) 2004-2009 Voltaire Inc. All rights reserved. * Copyright (c) 2009 HNR Consulting. All rights reserved. * * This software is available to you under a choice of one of two Index: ulp/libibmad/src/mad_internal.h =================================================================== --- ulp/libibmad/src/mad_internal.h (revision 2812) +++ ulp/libibmad/src/mad_internal.h (working copy) @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2006 Voltaire Inc. All rights reserved. + * Copyright (c) 2004-2009 Voltaire Inc. All rights reserved. * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU Index: ulp/libibmad/src/portid.c =================================================================== --- ulp/libibmad/src/portid.c (revision 2812) +++ ulp/libibmad/src/portid.c (working copy) @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2008 Voltaire Inc. All rights reserved. + * Copyright (c) 2004-2009 Voltaire Inc. All rights reserved. * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU Index: ulp/libibmad/src/register.c =================================================================== --- ulp/libibmad/src/register.c (revision 2812) +++ ulp/libibmad/src/register.c (working copy) @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004,2005 Voltaire Inc. All rights reserved. + * Copyright (c) 2004-2009 Voltaire Inc. All rights reserved. * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU Index: ulp/libibmad/src/resolve.c =================================================================== --- ulp/libibmad/src/resolve.c (revision 2812) +++ ulp/libibmad/src/resolve.c (working copy) @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2006 Voltaire Inc. All rights reserved. + * Copyright (c) 2004-2009 Voltaire Inc. All rights reserved. * Copyright (c) 2009 HNR Consulting. All rights reserved. * * This software is available to you under a choice of one of two @@ -98,7 +98,7 @@ ib_portid_t sm_portid; uint8_t buf[IB_SA_DATA_SIZE] = { 0 }; ib_portid_t self = { 0 }; - uint64_t selfguid; + uint64_t selfguid, prefix; ibmad_gid_t selfgid; uint8_t nodeinfo[64]; @@ -114,7 +114,8 @@ mad_set_field64(selfgid, 0, IB_GID_PREFIX_F, IB_DEFAULT_SUBN_PREFIX); mad_set_field64(selfgid, 0, IB_GID_GUID_F, selfguid); - if (*(uint64_t *) & portid->gid == 0) + memcpy(&prefix, portid->gid, sizeof(prefix)); + if (!prefix) mad_set_field64(portid->gid, 0, IB_GID_PREFIX_F, IB_DEFAULT_SUBN_PREFIX); if (guid) Index: ulp/libibmad/src/rpc.c =================================================================== --- ulp/libibmad/src/rpc.c (revision 2812) +++ ulp/libibmad/src/rpc.c (working copy) @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2006 Voltaire Inc. All rights reserved. + * Copyright (c) 2004-2009 Voltaire Inc. All rights reserved. * Copyright (c) 2009 HNR Consulting. All rights reserved. * * This software is available to you under a choice of one of two Index: ulp/libibmad/src/sa.c =================================================================== --- ulp/libibmad/src/sa.c (revision 2812) +++ ulp/libibmad/src/sa.c (working copy) @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2007 Voltaire Inc. All rights reserved. + * Copyright (c) 2004-2009 Voltaire Inc. All rights reserved. * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU Index: ulp/libibmad/src/serv.c =================================================================== --- ulp/libibmad/src/serv.c (revision 2812) +++ ulp/libibmad/src/serv.c (working copy) @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004,2005 Voltaire Inc. All rights reserved. + * Copyright (c) 2004-2009 Voltaire Inc. All rights reserved. * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU Index: ulp/libibmad/src/smp.c =================================================================== --- ulp/libibmad/src/smp.c (revision 2812) +++ ulp/libibmad/src/smp.c (working copy) @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2007 Voltaire Inc. All rights reserved. + * Copyright (c) 2004-2009 Voltaire Inc. All rights reserved. * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU Index: ulp/libibmad/src/Sources =================================================================== --- ulp/libibmad/src/Sources (revision 2812) +++ ulp/libibmad/src/Sources (working copy) @@ -29,7 +29,7 @@ vendor.c INCLUDES = ..\include\infiniband;\ - ..\include;\ + ..\include;..\include\windows;\ ..\..\libibverbs\include;\ ..\..\libibumad\include;\ ..\..\..\inc;\ @@ -37,6 +37,7 @@ ..\..\..\inc\user\linux; USER_C_FLAGS = $(USER_C_FLAGS) -DEXPORT_IBMAD_SYMBOLS +C_DEFINES = $(C_DEFINES) /DHAVE_CONFIG_H TARGETLIBS = \ $(SDK_LIB_PATH)\kernel32.lib \ Index: ulp/libibmad/src/vendor.c =================================================================== --- ulp/libibmad/src/vendor.c (revision 2812) +++ ulp/libibmad/src/vendor.c (working copy) @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004,2005 Voltaire Inc. All rights reserved. + * Copyright (c) 2004-2009 Voltaire Inc. All rights reserved. * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU _______________________________________________ ofw mailing list [email protected] http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ofw
