diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/autom4te.cache/output.0 open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/autom4te.cache/output.0 --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/autom4te.cache/output.0 2009-06-18 17:20:38.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/autom4te.cache/output.0 2009-07-28 15:10:36.000000000 -0500 @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.63 for brcm_iscsi 0.4.0. +@%:@ Generated by GNU Autoconf 2.63 for brcm_iscsi 0.4.3. @%:@ @%:@ Report bugs to <benli@broadcom.com>. @%:@ @@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='brcm_iscsi' PACKAGE_TARNAME='brcm_iscsi' -PACKAGE_VERSION='0.4.0' -PACKAGE_STRING='brcm_iscsi 0.4.0' +PACKAGE_VERSION='0.4.3' +PACKAGE_STRING='brcm_iscsi 0.4.3' PACKAGE_BUGREPORT='benli@broadcom.com' # Factoring default headers for most tests. @@ -1475,7 +1475,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures brcm_iscsi 0.4.0 to adapt to many kinds of systems. +\`configure' configures brcm_iscsi 0.4.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1545,7 +1545,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of brcm_iscsi 0.4.0:";; + short | recursive ) echo "Configuration of brcm_iscsi 0.4.3:";; esac cat <<\_ACEOF @@ -1650,7 +1650,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -brcm_iscsi configure 0.4.0 +brcm_iscsi configure 0.4.3 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1664,7 +1664,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by brcm_iscsi $as_me 0.4.0, which was +It was created by brcm_iscsi $as_me 0.4.3, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -15007,7 +15007,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by brcm_iscsi $as_me 0.4.0, which was +This file was extended by brcm_iscsi $as_me 0.4.3, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15070,7 +15070,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -brcm_iscsi config.status 0.4.0 +brcm_iscsi config.status 0.4.3 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/autom4te.cache/output.1 open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/autom4te.cache/output.1 --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/autom4te.cache/output.1 2009-06-18 16:06:43.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/autom4te.cache/output.1 2009-07-28 15:10:36.000000000 -0500 @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.63 for brcm_iscsi 0.3.0. +@%:@ Generated by GNU Autoconf 2.63 for brcm_iscsi 0.4.3. @%:@ @%:@ Report bugs to <benli@broadcom.com>. @%:@ @@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='brcm_iscsi' PACKAGE_TARNAME='brcm_iscsi' -PACKAGE_VERSION='0.3.0' -PACKAGE_STRING='brcm_iscsi 0.3.0' +PACKAGE_VERSION='0.4.3' +PACKAGE_STRING='brcm_iscsi 0.4.3' PACKAGE_BUGREPORT='benli@broadcom.com' # Factoring default headers for most tests. @@ -787,8 +787,6 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIB@&t@OBJS -ENABLE_PACKET_CAPTURE_FALSE -ENABLE_PACKET_CAPTURE_TRUE DEBUG_FALSE DEBUG_TRUE OTOOL64 @@ -913,7 +911,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_debug -enable_enable_packet_capture ' ac_precious_vars='build_alias host_alias @@ -1478,7 +1475,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures brcm_iscsi 0.3.0 to adapt to many kinds of systems. +\`configure' configures brcm_iscsi 0.4.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1548,7 +1545,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of brcm_iscsi 0.3.0:";; + short | recursive ) echo "Configuration of brcm_iscsi 0.4.3:";; esac cat <<\_ACEOF @@ -1564,7 +1561,6 @@ Optional Features: optimize for fast installation @<:@default=yes@:>@ --disable-libtool-lock avoid locking (might break parallel builds) --enable-debug Turn on compiler debugging information (default=no) - --enable-packet-capture Turn on the packet capture (default=no, Experimental) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1654,7 +1650,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -brcm_iscsi configure 0.3.0 +brcm_iscsi configure 0.4.3 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1668,7 +1664,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by brcm_iscsi $as_me 0.3.0, which was +It was created by brcm_iscsi $as_me 0.4.3, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -14569,25 +14565,6 @@ else fi -## check for --enable-packet-capture -## The packet capture is still experimental and disabled by default -@%:@ Check whether --enable-enable_packet_capture was given. -if test "${enable_enable_packet_capture+set}" = set; then - enableval=$enable_enable_packet_capture; if eval "test x$enable_packet_capture = xyes"; then - CFLAGS="${CFLAGS} -DENABLE_PACKET_CAPTURE" - fi -fi - - if test x$enable_packet_capture = xtrue; then - ENABLE_PACKET_CAPTURE_TRUE= - ENABLE_PACKET_CAPTURE_FALSE='#' -else - ENABLE_PACKET_CAPTURE_TRUE='#' - ENABLE_PACKET_CAPTURE_FALSE= -fi - - - ac_config_commands="$ac_config_commands default" @@ -14712,13 +14689,6 @@ $as_echo "$as_me: error: conditional \"D Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${ENABLE_PACKET_CAPTURE_TRUE}" && test -z "${ENABLE_PACKET_CAPTURE_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_PACKET_CAPTURE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"ENABLE_PACKET_CAPTURE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi : ${CONFIG_STATUS=./config.status} ac_write_fail=0 @@ -15041,7 +15011,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by brcm_iscsi $as_me 0.3.0, which was +This file was extended by brcm_iscsi $as_me 0.4.3, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15104,7 +15074,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -brcm_iscsi config.status 0.3.0 +brcm_iscsi config.status 0.4.3 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/autom4te.cache/requests open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/autom4te.cache/requests --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/autom4te.cache/requests 2009-06-18 17:20:40.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/autom4te.cache/requests 2009-07-28 15:10:36.000000000 -0500 @@ -19,12 +19,12 @@ '_LT_AC_TAGCONFIG' => 1, 'm4_pattern_forbid' => 1, 'AC_INIT' => 1, - '_AM_COND_IF' => 1, 'AC_CANONICAL_TARGET' => 1, - 'AC_SUBST' => 1, + '_AM_COND_IF' => 1, 'AC_CONFIG_LIBOBJ_DIR' => 1, - 'AC_FC_SRCEXT' => 1, + 'AC_SUBST' => 1, 'AC_CANONICAL_HOST' => 1, + 'AC_FC_SRCEXT' => 1, 'AC_PROG_LIBTOOL' => 1, 'AM_INIT_AUTOMAKE' => 1, 'AC_CONFIG_SUBDIRS' => 1, @@ -32,8 +32,8 @@ 'LT_CONFIG_LTDL_DIR' => 1, 'AC_CONFIG_LINKS' => 1, 'AC_REQUIRE_AUX_FILE' => 1, - 'm4_sinclude' => 1, 'LT_SUPPORTED_TAG' => 1, + 'm4_sinclude' => 1, 'AM_MAINTAINER_MODE' => 1, 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, '_m4_warn' => 1, @@ -41,230 +41,27 @@ '_AM_COND_ENDIF' => 1, 'AM_ENABLE_MULTILIB' => 1, 'AC_CONFIG_FILES' => 1, - 'LT_INIT' => 1, 'include' => 1, + 'LT_INIT' => 1, 'AM_GNU_GETTEXT' => 1, 'AC_LIBSOURCE' => 1, 'AM_PROG_FC_C_O' => 1, 'AC_CANONICAL_BUILD' => 1, 'AC_FC_FREEFORM' => 1, 'AH_OUTPUT' => 1, - '_AM_SUBST_NOTMAKE' => 1, 'AC_CONFIG_AUX_DIR' => 1, - 'sinclude' => 1, + '_AM_SUBST_NOTMAKE' => 1, 'AM_PROG_CC_C_O' => 1, 'm4_pattern_allow' => 1, - 'AC_CANONICAL_SYSTEM' => 1, + 'sinclude' => 1, 'AM_CONDITIONAL' => 1, + 'AC_CANONICAL_SYSTEM' => 1, 'AC_CONFIG_HEADERS' => 1, 'AC_DEFINE_TRACE_LITERAL' => 1, 'm4_include' => 1, '_AM_COND_ELSE' => 1, 'AC_SUBST_TRACE' => 1 } - ], 'Autom4te::Request' ), - bless( [ - '1', - 1, - [ - '/usr/share/autoconf' - ], - [ - '/usr/share/autoconf/autoconf/autoconf.m4f', - '/usr/share/aclocal/argz.m4', - '/usr/share/aclocal/libtool.m4', - '/usr/share/aclocal/ltdl.m4', - '/usr/share/aclocal/ltoptions.m4', - '/usr/share/aclocal/ltsugar.m4', - '/usr/share/aclocal/ltversion.m4', - '/usr/share/aclocal/lt~obsolete.m4', - '/usr/share/aclocal-1.10/amversion.m4', - '/usr/share/aclocal-1.10/auxdir.m4', - '/usr/share/aclocal-1.10/cond.m4', - '/usr/share/aclocal-1.10/depend.m4', - '/usr/share/aclocal-1.10/depout.m4', - '/usr/share/aclocal-1.10/init.m4', - '/usr/share/aclocal-1.10/install-sh.m4', - '/usr/share/aclocal-1.10/lead-dot.m4', - '/usr/share/aclocal-1.10/make.m4', - '/usr/share/aclocal-1.10/minuso.m4', - '/usr/share/aclocal-1.10/missing.m4', - '/usr/share/aclocal-1.10/mkdirp.m4', - '/usr/share/aclocal-1.10/options.m4', - '/usr/share/aclocal-1.10/runlog.m4', - '/usr/share/aclocal-1.10/sanity.m4', - '/usr/share/aclocal-1.10/strip.m4', - '/usr/share/aclocal-1.10/substnot.m4', - '/usr/share/aclocal-1.10/tar.m4', - 'configure.ac' - ], - { - 'AM_ENABLE_STATIC' => 1, - 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, - '_LT_AC_SHELL_INIT' => 1, - 'AC_DEFUN' => 1, - '_LT_AC_LANG_CXX_CONFIG' => 1, - 'AC_PROG_LIBTOOL' => 1, - 'AM_PROG_MKDIR_P' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'AM_MISSING_PROG' => 1, - 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, - '_LT_AC_LANG_C_CONFIG' => 1, - 'AM_PROG_INSTALL_STRIP' => 1, - '_m4_warn' => 1, - 'AC_LIBTOOL_OBJDIR' => 1, - 'gl_FUNC_ARGZ' => 1, - 'AM_SANITY_CHECK' => 1, - 'LTOBSOLETE_VERSION' => 1, - 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, - 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, - 'LT_LIB_M' => 1, - '_LT_AC_CHECK_DLFCN' => 1, - 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, - 'LTSUGAR_VERSION' => 1, - '_LT_PROG_LTMAIN' => 1, - 'LT_SYS_SYMBOL_USCORE' => 1, - '_AM_PROG_TAR' => 1, - 'AC_LIBTOOL_GCJ' => 1, - 'LT_SYS_DLOPEN_DEPLIBS' => 1, - 'LT_FUNC_DLSYM_USCORE' => 1, - '_LT_AC_LANG_F77' => 1, - 'AC_LIBTOOL_CONFIG' => 1, - '_AM_SUBST_NOTMAKE' => 1, - 'AC_LTDL_DLLIB' => 1, - '_AM_AUTOCONF_VERSION' => 1, - 'AM_DISABLE_SHARED' => 1, - '_LTDL_SETUP' => 1, - 'AM_PROG_LIBTOOL' => 1, - '_LT_AC_LANG_CXX' => 1, - 'AM_PROG_LD' => 1, - '_LT_AC_FILE_LTDLL_C' => 1, - 'AC_LIB_LTDL' => 1, - 'AU_DEFUN' => 1, - 'AC_PROG_NM' => 1, - 'AC_LIBTOOL_DLOPEN' => 1, - 'AC_PROG_LD' => 1, - 'AC_ENABLE_FAST_INSTALL' => 1, - 'AC_PROG_LD_GNU' => 1, - 'AC_LIBTOOL_FC' => 1, - 'LTDL_CONVENIENCE' => 1, - '_AM_SET_OPTION' => 1, - 'AC_LTDL_PREOPEN' => 1, - '_LT_LINKER_BOILERPLATE' => 1, - 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, - 'AC_LIBTOOL_PROG_CC_C_O' => 1, - 'gl_PREREQ_ARGZ' => 1, - 'LT_SUPPORTED_TAG' => 1, - 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'LT_PROG_RC' => 1, - 'LT_SYS_MODULE_EXT' => 1, - 'AC_DEFUN_ONCE' => 1, - '_LT_AC_LANG_GCJ' => 1, - 'AC_LTDL_OBJDIR' => 1, - '_LT_PATH_TOOL_PREFIX' => 1, - 'AC_LIBTOOL_RC' => 1, - 'AC_DISABLE_FAST_INSTALL' => 1, - '_LT_AC_PROG_ECHO_BACKSLASH' => 1, - 'include' => 1, - '_LT_AC_TRY_DLOPEN_SELF' => 1, - '_LT_AC_SYS_LIBPATH_AIX' => 1, - 'LT_AC_PROG_SED' => 1, - 'AM_ENABLE_SHARED' => 1, - 'LTDL_INSTALLABLE' => 1, - '_LT_AC_LANG_GCJ_CONFIG' => 1, - 'AC_ENABLE_SHARED' => 1, - 'AC_ENABLE_STATIC' => 1, - 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, - '_LT_AC_TAGVAR' => 1, - 'AM_PROG_CC_C_O' => 1, - 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, - 'AM_CONDITIONAL' => 1, - 'LT_LIB_DLLOAD' => 1, - 'LTDL_INIT' => 1, - 'LTVERSION_VERSION' => 1, - 'm4_include' => 1, - 'AM_PROG_INSTALL_SH' => 1, - 'AC_PROG_EGREP' => 1, - 'AC_PATH_MAGIC' => 1, - '_AC_AM_CONFIG_HEADER_HOOK' => 1, - 'AC_LTDL_SYSSEARCHPATH' => 1, - 'AM_MAKE_INCLUDE' => 1, - '_LT_AC_TAGCONFIG' => 1, - 'LT_CMD_MAX_LEN' => 1, - 'm4_pattern_forbid' => 1, - '_LT_LINKER_OPTION' => 1, - 'AC_LIBTOOL_COMPILER_OPTION' => 1, - 'AC_DISABLE_SHARED' => 1, - '_LT_COMPILER_BOILERPLATE' => 1, - 'AC_LIBTOOL_WIN32_DLL' => 1, - 'AC_LIBTOOL_SETUP' => 1, - 'AC_PROG_LD_RELOAD_FLAG' => 1, - 'AC_LTDL_DLSYM_USCORE' => 1, - 'AM_MISSING_HAS_RUN' => 1, - 'LT_LANG' => 1, - 'LT_SYS_DLSEARCH_PATH' => 1, - 'LT_CONFIG_LTDL_DIR' => 1, - 'AC_LIBTOOL_DLOPEN_SELF' => 1, - 'LT_OUTPUT' => 1, - 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, - 'AC_WITH_LTDL' => 1, - 'AC_LIBTOOL_LINKER_OPTION' => 1, - 'LT_AC_PROG_RC' => 1, - 'AC_LIBTOOL_CXX' => 1, - 'LT_INIT' => 1, - 'LT_AC_PROG_GCJ' => 1, - 'LT_SYS_DLOPEN_SELF' => 1, - 'AM_DISABLE_STATIC' => 1, - 'AM_DEP_TRACK' => 1, - '_AC_PROG_LIBTOOL' => 1, - '_AM_IF_OPTION' => 1, - 'AC_PATH_TOOL_PREFIX' => 1, - 'm4_pattern_allow' => 1, - 'AC_LIBTOOL_F77' => 1, - 'AM_SET_LEADING_DOT' => 1, - 'LT_AC_PROG_EGREP' => 1, - '_AM_DEPENDENCIES' => 1, - 'AC_LIBTOOL_LANG_C_CONFIG' => 1, - 'LTOPTIONS_VERSION' => 1, - '_LT_AC_SYS_COMPILER' => 1, - 'AM_PROG_NM' => 1, - 'AC_LIBLTDL_CONVENIENCE' => 1, - 'AC_DEPLIBS_CHECK_METHOD' => 1, - 'AC_LIBLTDL_INSTALLABLE' => 1, - 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, - 'AC_LTDL_ENABLE_INSTALL' => 1, - 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, - 'LT_PROG_GCJ' => 1, - 'AM_INIT_AUTOMAKE' => 1, - 'AC_DISABLE_STATIC' => 1, - 'LT_PATH_NM' => 1, - 'AC_LTDL_SHLIBEXT' => 1, - '_LT_AC_LOCK' => 1, - '_LT_AC_LANG_RC_CONFIG' => 1, - 'LT_SYS_MODULE_PATH' => 1, - 'LT_WITH_LTDL' => 1, - 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, - 'AC_LTDL_SHLIBPATH' => 1, - 'AM_AUX_DIR_EXPAND' => 1, - 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, - '_LT_AC_LANG_F77_CONFIG' => 1, - '_LT_COMPILER_OPTION' => 1, - '_AM_SET_OPTIONS' => 1, - 'AM_RUN_LOG' => 1, - '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'AC_LIBTOOL_PICMODE' => 1, - 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, - 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, - 'AC_CHECK_LIBM' => 1, - 'LT_PATH_LD' => 1, - 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, - '_AM_MANGLE_OPTION' => 1, - 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, - 'AC_LTDL_SYMBOL_USCORE' => 1, - 'AM_SET_DEPDIR' => 1, - '_LT_CC_BASENAME' => 1, - '_LT_LIBOBJ' => 1 - } ], 'Autom4te::Request' ) ); diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/autom4te.cache/traces.0 open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/autom4te.cache/traces.0 --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/autom4te.cache/traces.0 2009-06-18 17:20:38.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/autom4te.cache/traces.0 2009-07-28 15:10:36.000000000 -0500 @@ -1,4 +1,4 @@ -m4trace:configure.ac:15: -1- AC_INIT([brcm_iscsi], [0.4.0], [benli@broadcom.com]) +m4trace:configure.ac:15: -1- AC_INIT([brcm_iscsi], [0.4.3], [benli@broadcom.com]) m4trace:configure.ac:15: -1- m4_pattern_forbid([^_?A[CHUM]_]) m4trace:configure.ac:15: -1- m4_pattern_forbid([_AC_]) m4trace:configure.ac:15: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS']) diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/autom4te.cache/traces.1 open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/autom4te.cache/traces.1 --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/autom4te.cache/traces.1 2009-06-18 16:06:43.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/autom4te.cache/traces.1 2009-07-28 15:10:36.000000000 -0500 @@ -2297,15 +2297,10 @@ m4trace:configure.ac:62: -1- m4_pattern_ m4trace:configure.ac:62: -1- m4_pattern_allow([^DEBUG_FALSE$]) m4trace:configure.ac:62: -1- _AM_SUBST_NOTMAKE([DEBUG_TRUE]) m4trace:configure.ac:62: -1- _AM_SUBST_NOTMAKE([DEBUG_FALSE]) -m4trace:configure.ac:71: -1- AM_CONDITIONAL([ENABLE_PACKET_CAPTURE], [test x$enable_packet_capture = xtrue]) -m4trace:configure.ac:71: -1- m4_pattern_allow([^ENABLE_PACKET_CAPTURE_TRUE$]) -m4trace:configure.ac:71: -1- m4_pattern_allow([^ENABLE_PACKET_CAPTURE_FALSE$]) -m4trace:configure.ac:71: -1- _AM_SUBST_NOTMAKE([ENABLE_PACKET_CAPTURE_TRUE]) -m4trace:configure.ac:71: -1- _AM_SUBST_NOTMAKE([ENABLE_PACKET_CAPTURE_FALSE]) -m4trace:configure.ac:76: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments. +m4trace:configure.ac:66: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments. You should run autoupdate.], []) -m4trace:configure.ac:76: -1- m4_pattern_allow([^LIB@&t@OBJS$]) -m4trace:configure.ac:76: -1- m4_pattern_allow([^LTLIBOBJS$]) -m4trace:configure.ac:76: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"]) -m4trace:configure.ac:76: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS -m4trace:configure.ac:76: -1- _LT_PROG_LTMAIN +m4trace:configure.ac:66: -1- m4_pattern_allow([^LIB@&t@OBJS$]) +m4trace:configure.ac:66: -1- m4_pattern_allow([^LTLIBOBJS$]) +m4trace:configure.ac:66: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"]) +m4trace:configure.ac:66: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS +m4trace:configure.ac:66: -1- _LT_PROG_LTMAIN diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/ChangeLog open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/ChangeLog --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/ChangeLog 2009-05-13 12:32:15.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/ChangeLog 2009-07-28 15:10:36.000000000 -0500 @@ -0,0 +1,7 @@ +Version 0.4.1 (July 20, 2009) + * Fix from Mike Christie to determine page size from getpagesize() + rather then the constant PAGE_SIZE. PAGE_SIZE is not defined om + ia64 and ppc. + * Update documentation to indicate IPv6 is not supported + * Fix code to catch the message from the CNIC that the network + interface is going down. diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/config.h open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/config.h --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/config.h 2009-05-21 18:40:13.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/config.h 2009-07-28 15:10:36.000000000 -0500 @@ -75,13 +75,13 @@ #define PACKAGE_NAME "brcm_iscsi" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "brcm_iscsi 0.3.0" +#define PACKAGE_STRING "brcm_iscsi 0.4.3" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "brcm_iscsi" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.3.0" +#define PACKAGE_VERSION "0.4.3" /* The size of `int', as computed by sizeof. */ #define SIZEOF_INT 4 diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/config.log open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/config.log --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/config.log 2009-06-18 16:06:57.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/config.log 2009-07-28 15:10:36.000000000 -0500 @@ -1,20 +1,20 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by brcm_iscsi configure 0.3.0, which was +It was created by brcm_iscsi configure 0.4.3, which was generated by GNU Autoconf 2.63. Invocation command line was - $ ./configure --no-create --no-recursion + $ ./configure ## --------- ## ## Platform. ## ## --------- ## -hostname = dhcp-10-12-136-116 +hostname = localhost uname -m = x86_64 -uname -r = 2.6.30 +uname -r = 2.6.30.1 uname -s = Linux -uname -v = #5 SMP PREEMPT Wed Jun 17 10:50:51 PDT 2009 +uname -v = #1 SMP PREEMPT Tue Jul 14 10:25:32 PDT 2009 /usr/bin/uname -p = Intel(R) Core(TM)2 Duo CPU T7300 @ 2.00GHz /bin/uname -X = unknown @@ -41,106 +41,106 @@ PATH: /usr/libexec/git-core/ ## Core tests. ## ## ----------- ## -configure:2087: checking for a BSD-compatible install -configure:2155: result: /usr/bin/install -c -configure:2166: checking whether build environment is sane -configure:2209: result: yes -configure:2234: checking for a thread-safe mkdir -p -configure:2273: result: /bin/mkdir -p -configure:2286: checking for gawk -configure:2302: found /usr/bin/gawk -configure:2313: result: gawk -configure:2324: checking whether make sets $(MAKE) -configure:2346: result: yes -configure:2536: checking for bash -configure:2566: result: /bin/sh -configure:2626: checking for gcc -configure:2642: found /usr/bin/gcc -configure:2653: result: gcc -configure:2885: checking for C compiler version -configure:2893: gcc --version >&5 +configure:2083: checking for a BSD-compatible install +configure:2151: result: /usr/bin/install -c +configure:2162: checking whether build environment is sane +configure:2205: result: yes +configure:2230: checking for a thread-safe mkdir -p +configure:2269: result: /bin/mkdir -p +configure:2282: checking for gawk +configure:2298: found /usr/bin/gawk +configure:2309: result: gawk +configure:2320: checking whether make sets $(MAKE) +configure:2342: result: yes +configure:2532: checking for bash +configure:2562: result: /bin/sh +configure:2622: checking for gcc +configure:2638: found /usr/bin/gcc +configure:2649: result: gcc +configure:2881: checking for C compiler version +configure:2889: gcc --version >&5 gcc (Gentoo 4.3.3-r2 p1.1, pie-10.1.5) 4.3.3 Copyright (C) 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -configure:2897: $? = 0 -configure:2904: gcc -v >&5 +configure:2893: $? = 0 +configure:2900: gcc -v >&5 Using built-in specs. Target: x86_64-pc-linux-gnu Configured with: /var/tmp/portage/sys-devel/gcc-4.3.3-r2/work/gcc-4.3.3/configure --prefix=/usr --bindir=/usr/x86_64-pc-linux-gnu/gcc-bin/4.3.3 --includedir=/usr/lib/gcc/x86_64-pc-linux-gnu/4.3.3/include --datadir=/usr/share/gcc-data/x86_64-pc-linux-gnu/4.3.3 --mandir=/usr/share/gcc-data/x86_64-pc-linux-gnu/4.3.3/man --infodir=/usr/share/gcc-data/x86_64-pc-linux-gnu/4.3.3/info --with-gxx-include-dir=/usr/lib/gcc/x86_64-pc-linux-gnu/4.3.3/include/g++-v4 --host=x86_64-pc-linux-gnu --build=x86_64-pc-linux-gnu --disable-altivec --disable-fixed-point --enable-nls --without-included-gettext --with-system-zlib --disable-checking --disable-werror --enable-secureplt --enable-multilib --enable-libmudflap --disable-libssp --enable-libgomp --enable-cld --disable-libgcj --enable-languages=c,c++,treelang,fortran --enable-shared --enable-threads=posix --enable-__cxa_atexit --enable-clocale=gnu --with-bugurl=http://bugs.gentoo.org/ --with-pkgversion='Gentoo 4.3.3-r2 p1.1, pie-10.1.5' Thread model: posix gcc version 4.3.3 (Gentoo 4.3.3-r2 p1.1, pie-10.1.5) -configure:2908: $? = 0 -configure:2915: gcc -V >&5 +configure:2904: $? = 0 +configure:2911: gcc -V >&5 gcc: '-V' option must have argument -configure:2919: $? = 1 -configure:2942: checking for C compiler default output file name -configure:2964: gcc conftest.c >&5 -configure:2968: $? = 0 -configure:3006: result: a.out -configure:3025: checking whether the C compiler works -configure:3035: ./a.out -configure:3039: $? = 0 -configure:3058: result: yes -configure:3065: checking whether we are cross compiling -configure:3067: result: no -configure:3070: checking for suffix of executables -configure:3077: gcc -o conftest conftest.c >&5 -configure:3081: $? = 0 -configure:3107: result: -configure:3113: checking for suffix of object files -configure:3139: gcc -c conftest.c >&5 -configure:3143: $? = 0 -configure:3168: result: o -configure:3172: checking whether we are using the GNU C compiler -configure:3201: gcc -c conftest.c >&5 -configure:3208: $? = 0 -configure:3225: result: yes -configure:3234: checking whether gcc accepts -g -configure:3264: gcc -c -g conftest.c >&5 -configure:3271: $? = 0 -configure:3372: result: yes -configure:3389: checking for gcc option to accept ISO C89 -configure:3463: gcc -c -g -O2 conftest.c >&5 -configure:3470: $? = 0 -configure:3493: result: none needed -configure:3522: checking for style of include used by make -configure:3550: result: GNU -configure:3575: checking dependency style of gcc -configure:3666: result: gcc3 -configure:3682: checking whether gcc and cc understand -c and -o together -configure:3717: gcc -c conftest.c -o conftest2.o >&5 -configure:3721: $? = 0 -configure:3727: gcc -c conftest.c -o conftest2.o >&5 -configure:3731: $? = 0 -configure:3742: cc -c conftest.c >&5 -configure:3746: $? = 0 -configure:3754: cc -c conftest.c -o conftest2.o >&5 -configure:3758: $? = 0 -configure:3764: cc -c conftest.c -o conftest2.o >&5 -configure:3768: $? = 0 -configure:3786: result: yes -configure:3818: checking for flex -configure:3834: found /usr/bin/flex -configure:3845: result: flex -configure:3882: flex conftest.l -configure:3886: $? = 0 -configure:3888: checking lex output file root -configure:3904: result: lex.yy -configure:3909: checking lex library -configure:3928: gcc -o conftest -g -O2 conftest.c >&5 +configure:2915: $? = 1 +configure:2938: checking for C compiler default output file name +configure:2960: gcc conftest.c >&5 +configure:2964: $? = 0 +configure:3002: result: a.out +configure:3021: checking whether the C compiler works +configure:3031: ./a.out +configure:3035: $? = 0 +configure:3054: result: yes +configure:3061: checking whether we are cross compiling +configure:3063: result: no +configure:3066: checking for suffix of executables +configure:3073: gcc -o conftest conftest.c >&5 +configure:3077: $? = 0 +configure:3103: result: +configure:3109: checking for suffix of object files +configure:3135: gcc -c conftest.c >&5 +configure:3139: $? = 0 +configure:3164: result: o +configure:3168: checking whether we are using the GNU C compiler +configure:3197: gcc -c conftest.c >&5 +configure:3204: $? = 0 +configure:3221: result: yes +configure:3230: checking whether gcc accepts -g +configure:3260: gcc -c -g conftest.c >&5 +configure:3267: $? = 0 +configure:3368: result: yes +configure:3385: checking for gcc option to accept ISO C89 +configure:3459: gcc -c -g -O2 conftest.c >&5 +configure:3466: $? = 0 +configure:3489: result: none needed +configure:3518: checking for style of include used by make +configure:3546: result: GNU +configure:3571: checking dependency style of gcc +configure:3662: result: gcc3 +configure:3678: checking whether gcc and cc understand -c and -o together +configure:3713: gcc -c conftest.c -o conftest2.o >&5 +configure:3717: $? = 0 +configure:3723: gcc -c conftest.c -o conftest2.o >&5 +configure:3727: $? = 0 +configure:3738: cc -c conftest.c >&5 +configure:3742: $? = 0 +configure:3750: cc -c conftest.c -o conftest2.o >&5 +configure:3754: $? = 0 +configure:3760: cc -c conftest.c -o conftest2.o >&5 +configure:3764: $? = 0 +configure:3782: result: yes +configure:3814: checking for flex +configure:3830: found /usr/bin/flex +configure:3841: result: flex +configure:3878: flex conftest.l +configure:3882: $? = 0 +configure:3884: checking lex output file root +configure:3900: result: lex.yy +configure:3905: checking lex library +configure:3924: gcc -o conftest -g -O2 conftest.c >&5 lex.yy.c: In function 'yylex': conftest.l:2: warning: ignoring return value of 'fwrite', declared with attribute warn_unused_result conftest.l:9: warning: ignoring return value of 'fwrite', declared with attribute warn_unused_result -/tmp/cc4WXLRM.o: In function `input': -/home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/lex.yy.c:1168: undefined reference to `yywrap' -/tmp/cc4WXLRM.o: In function `yylex': -/home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/lex.yy.c:867: undefined reference to `yywrap' -/tmp/cc4WXLRM.o: In function `main': -/home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/conftest.l:17: undefined reference to `yywrap' +/tmp/ccyLPp8w.o: In function `input': +/tmp/brcm_iscsi_uio-0.4.3/lex.yy.c:1168: undefined reference to `yywrap' +/tmp/ccyLPp8w.o: In function `yylex': +/tmp/brcm_iscsi_uio-0.4.3/lex.yy.c:867: undefined reference to `yywrap' +/tmp/ccyLPp8w.o: In function `main': +/tmp/brcm_iscsi_uio-0.4.3/conftest.l:17: undefined reference to `yywrap' collect2: ld returned 1 exit status -configure:3935: $? = 1 +configure:3931: $? = 1 configure: failed program was: | | #line 3 "lex.yy.c" @@ -1923,116 +1923,116 @@ configure: failed program was: | { | return ! yylex () + ! yywrap (); | } -configure:3928: gcc -o conftest -g -O2 conftest.c -lfl >&5 +configure:3924: gcc -o conftest -g -O2 conftest.c -lfl >&5 lex.yy.c: In function 'yylex': conftest.l:2: warning: ignoring return value of 'fwrite', declared with attribute warn_unused_result conftest.l:9: warning: ignoring return value of 'fwrite', declared with attribute warn_unused_result -configure:3935: $? = 0 -configure:3959: result: -lfl -configure:3965: checking whether yytext is a pointer -configure:3986: gcc -o conftest -g -O2 conftest.c -lfl >&5 +configure:3931: $? = 0 +configure:3955: result: -lfl +configure:3961: checking whether yytext is a pointer +configure:3982: gcc -o conftest -g -O2 conftest.c -lfl >&5 lex.yy.c: In function 'yylex': conftest.l:2: warning: ignoring return value of 'fwrite', declared with attribute warn_unused_result conftest.l:9: warning: ignoring return value of 'fwrite', declared with attribute warn_unused_result -configure:3993: $? = 0 -configure:4015: result: yes -configure:4031: checking for bison -configure:4047: found /usr/bin/bison -configure:4058: result: bison -y -configure:4076: checking how to run the C preprocessor -configure:4116: gcc -E conftest.c -configure:4123: $? = 0 -configure:4154: gcc -E conftest.c +configure:3989: $? = 0 +configure:4011: result: yes +configure:4027: checking for bison +configure:4043: found /usr/bin/bison +configure:4054: result: bison -y +configure:4072: checking how to run the C preprocessor +configure:4112: gcc -E conftest.c +configure:4119: $? = 0 +configure:4150: gcc -E conftest.c conftest.c:11:28: error: ac_nonexistent.h: No such file or directory -configure:4161: $? = 1 +configure:4157: $? = 1 configure: failed program was: | /* confdefs.h. */ | #define PACKAGE_NAME "brcm_iscsi" | #define PACKAGE_TARNAME "brcm_iscsi" -| #define PACKAGE_VERSION "0.3.0" -| #define PACKAGE_STRING "brcm_iscsi 0.3.0" +| #define PACKAGE_VERSION "0.4.3" +| #define PACKAGE_STRING "brcm_iscsi 0.4.3" | #define PACKAGE_BUGREPORT "benli@broadcom.com" | #define PACKAGE "" | #define VERSION "" | #define YYTEXT_POINTER 1 | /* end confdefs.h. */ | #include <ac_nonexistent.h> -configure:4194: result: gcc -E -configure:4223: gcc -E conftest.c -configure:4230: $? = 0 -configure:4261: gcc -E conftest.c +configure:4190: result: gcc -E +configure:4219: gcc -E conftest.c +configure:4226: $? = 0 +configure:4257: gcc -E conftest.c conftest.c:11:28: error: ac_nonexistent.h: No such file or directory -configure:4268: $? = 1 +configure:4264: $? = 1 configure: failed program was: | /* confdefs.h. */ | #define PACKAGE_NAME "brcm_iscsi" | #define PACKAGE_TARNAME "brcm_iscsi" -| #define PACKAGE_VERSION "0.3.0" -| #define PACKAGE_STRING "brcm_iscsi 0.3.0" +| #define PACKAGE_VERSION "0.4.3" +| #define PACKAGE_STRING "brcm_iscsi 0.4.3" | #define PACKAGE_BUGREPORT "benli@broadcom.com" | #define PACKAGE "" | #define VERSION "" | #define YYTEXT_POINTER 1 | /* end confdefs.h. */ | #include <ac_nonexistent.h> -configure:4308: checking for grep that handles long lines and -e -configure:4368: result: /bin/grep -configure:4373: checking for egrep -configure:4437: result: /bin/grep -E -configure:4442: checking for ANSI C header files -configure:4472: gcc -c -g -O2 conftest.c >&5 -configure:4479: $? = 0 -configure:4578: gcc -o conftest -g -O2 conftest.c >&5 -configure:4582: $? = 0 -configure:4588: ./conftest -configure:4592: $? = 0 -configure:4610: result: yes -configure:4634: checking for sys/types.h -configure:4655: gcc -c -g -O2 conftest.c >&5 -configure:4662: $? = 0 -configure:4679: result: yes -configure:4634: checking for sys/stat.h -configure:4655: gcc -c -g -O2 conftest.c >&5 -configure:4662: $? = 0 -configure:4679: result: yes -configure:4634: checking for stdlib.h -configure:4655: gcc -c -g -O2 conftest.c >&5 -configure:4662: $? = 0 -configure:4679: result: yes -configure:4634: checking for string.h -configure:4655: gcc -c -g -O2 conftest.c >&5 -configure:4662: $? = 0 -configure:4679: result: yes -configure:4634: checking for memory.h -configure:4655: gcc -c -g -O2 conftest.c >&5 -configure:4662: $? = 0 -configure:4679: result: yes -configure:4634: checking for strings.h -configure:4655: gcc -c -g -O2 conftest.c >&5 -configure:4662: $? = 0 -configure:4679: result: yes -configure:4634: checking for inttypes.h -configure:4655: gcc -c -g -O2 conftest.c >&5 -configure:4662: $? = 0 -configure:4679: result: yes -configure:4634: checking for stdint.h -configure:4655: gcc -c -g -O2 conftest.c >&5 -configure:4662: $? = 0 -configure:4679: result: yes -configure:4634: checking for unistd.h -configure:4655: gcc -c -g -O2 conftest.c >&5 -configure:4662: $? = 0 -configure:4679: result: yes -configure:4704: checking minix/config.h usability -configure:4721: gcc -c -g -O2 conftest.c >&5 +configure:4304: checking for grep that handles long lines and -e +configure:4364: result: /bin/grep +configure:4369: checking for egrep +configure:4433: result: /bin/grep -E +configure:4438: checking for ANSI C header files +configure:4468: gcc -c -g -O2 conftest.c >&5 +configure:4475: $? = 0 +configure:4574: gcc -o conftest -g -O2 conftest.c >&5 +configure:4578: $? = 0 +configure:4584: ./conftest +configure:4588: $? = 0 +configure:4606: result: yes +configure:4630: checking for sys/types.h +configure:4651: gcc -c -g -O2 conftest.c >&5 +configure:4658: $? = 0 +configure:4675: result: yes +configure:4630: checking for sys/stat.h +configure:4651: gcc -c -g -O2 conftest.c >&5 +configure:4658: $? = 0 +configure:4675: result: yes +configure:4630: checking for stdlib.h +configure:4651: gcc -c -g -O2 conftest.c >&5 +configure:4658: $? = 0 +configure:4675: result: yes +configure:4630: checking for string.h +configure:4651: gcc -c -g -O2 conftest.c >&5 +configure:4658: $? = 0 +configure:4675: result: yes +configure:4630: checking for memory.h +configure:4651: gcc -c -g -O2 conftest.c >&5 +configure:4658: $? = 0 +configure:4675: result: yes +configure:4630: checking for strings.h +configure:4651: gcc -c -g -O2 conftest.c >&5 +configure:4658: $? = 0 +configure:4675: result: yes +configure:4630: checking for inttypes.h +configure:4651: gcc -c -g -O2 conftest.c >&5 +configure:4658: $? = 0 +configure:4675: result: yes +configure:4630: checking for stdint.h +configure:4651: gcc -c -g -O2 conftest.c >&5 +configure:4658: $? = 0 +configure:4675: result: yes +configure:4630: checking for unistd.h +configure:4651: gcc -c -g -O2 conftest.c >&5 +configure:4658: $? = 0 +configure:4675: result: yes +configure:4700: checking minix/config.h usability +configure:4717: gcc -c -g -O2 conftest.c >&5 conftest.c:54:26: error: minix/config.h: No such file or directory -configure:4728: $? = 1 +configure:4724: $? = 1 configure: failed program was: | /* confdefs.h. */ | #define PACKAGE_NAME "brcm_iscsi" | #define PACKAGE_TARNAME "brcm_iscsi" -| #define PACKAGE_VERSION "0.3.0" -| #define PACKAGE_STRING "brcm_iscsi 0.3.0" +| #define PACKAGE_VERSION "0.4.3" +| #define PACKAGE_STRING "brcm_iscsi 0.4.3" | #define PACKAGE_BUGREPORT "benli@broadcom.com" | #define PACKAGE "" | #define VERSION "" @@ -2082,17 +2082,17 @@ configure: failed program was: | # include <unistd.h> | #endif | #include <minix/config.h> -configure:4742: result: no -configure:4746: checking minix/config.h presence -configure:4761: gcc -E conftest.c +configure:4738: result: no +configure:4742: checking minix/config.h presence +configure:4757: gcc -E conftest.c conftest.c:21:26: error: minix/config.h: No such file or directory -configure:4768: $? = 1 +configure:4764: $? = 1 configure: failed program was: | /* confdefs.h. */ | #define PACKAGE_NAME "brcm_iscsi" | #define PACKAGE_TARNAME "brcm_iscsi" -| #define PACKAGE_VERSION "0.3.0" -| #define PACKAGE_STRING "brcm_iscsi 0.3.0" +| #define PACKAGE_VERSION "0.4.3" +| #define PACKAGE_STRING "brcm_iscsi 0.4.3" | #define PACKAGE_BUGREPORT "benli@broadcom.com" | #define PACKAGE "" | #define VERSION "" @@ -2109,38 +2109,38 @@ configure: failed program was: | #define HAVE_UNISTD_H 1 | /* end confdefs.h. */ | #include <minix/config.h> -configure:4782: result: no -configure:4815: checking for minix/config.h -configure:4822: result: no -configure:4853: checking whether it is safe to define __EXTENSIONS__ -configure:4881: gcc -c -g -O2 conftest.c >&5 -configure:4888: $? = 0 -configure:4903: result: yes -configure:4941: checking for a BSD-compatible install -configure:5009: result: /usr/bin/install -c -configure:5021: checking whether gcc needs -traditional -configure:5063: result: no -configure:5072: checking for an ANSI C-conforming const -configure:5147: gcc -c -g -O2 conftest.c >&5 -configure:5154: $? = 0 -configure:5169: result: yes -configure:5179: checking for inline -configure:5205: gcc -c -g -O2 conftest.c >&5 -configure:5212: $? = 0 -configure:5230: result: inline -configure:5249: checking for off_t -configure:5277: gcc -c -g -O2 conftest.c >&5 -configure:5284: $? = 0 -configure:5311: gcc -c -g -O2 conftest.c >&5 +configure:4778: result: no +configure:4811: checking for minix/config.h +configure:4818: result: no +configure:4849: checking whether it is safe to define __EXTENSIONS__ +configure:4877: gcc -c -g -O2 conftest.c >&5 +configure:4884: $? = 0 +configure:4899: result: yes +configure:4937: checking for a BSD-compatible install +configure:5005: result: /usr/bin/install -c +configure:5017: checking whether gcc needs -traditional +configure:5059: result: no +configure:5068: checking for an ANSI C-conforming const +configure:5143: gcc -c -g -O2 conftest.c >&5 +configure:5150: $? = 0 +configure:5165: result: yes +configure:5175: checking for inline +configure:5201: gcc -c -g -O2 conftest.c >&5 +configure:5208: $? = 0 +configure:5226: result: inline +configure:5245: checking for off_t +configure:5273: gcc -c -g -O2 conftest.c >&5 +configure:5280: $? = 0 +configure:5307: gcc -c -g -O2 conftest.c >&5 conftest.c: In function 'main': conftest.c:62: error: expected expression before ')' token -configure:5318: $? = 1 +configure:5314: $? = 1 configure: failed program was: | /* confdefs.h. */ | #define PACKAGE_NAME "brcm_iscsi" | #define PACKAGE_TARNAME "brcm_iscsi" -| #define PACKAGE_VERSION "0.3.0" -| #define PACKAGE_STRING "brcm_iscsi 0.3.0" +| #define PACKAGE_VERSION "0.4.3" +| #define PACKAGE_STRING "brcm_iscsi 0.4.3" | #define PACKAGE_BUGREPORT "benli@broadcom.com" | #define PACKAGE "" | #define VERSION "" @@ -2202,20 +2202,20 @@ configure: failed program was: | ; | return 0; | } -configure:5341: result: yes -configure:5353: checking for size_t -configure:5381: gcc -c -g -O2 conftest.c >&5 -configure:5388: $? = 0 -configure:5415: gcc -c -g -O2 conftest.c >&5 +configure:5337: result: yes +configure:5349: checking for size_t +configure:5377: gcc -c -g -O2 conftest.c >&5 +configure:5384: $? = 0 +configure:5411: gcc -c -g -O2 conftest.c >&5 conftest.c: In function 'main': conftest.c:62: error: expected expression before ')' token -configure:5422: $? = 1 +configure:5418: $? = 1 configure: failed program was: | /* confdefs.h. */ | #define PACKAGE_NAME "brcm_iscsi" | #define PACKAGE_TARNAME "brcm_iscsi" -| #define PACKAGE_VERSION "0.3.0" -| #define PACKAGE_STRING "brcm_iscsi 0.3.0" +| #define PACKAGE_VERSION "0.4.3" +| #define PACKAGE_STRING "brcm_iscsi 0.4.3" | #define PACKAGE_BUGREPORT "benli@broadcom.com" | #define PACKAGE "" | #define VERSION "" @@ -2277,20 +2277,20 @@ configure: failed program was: | ; | return 0; | } -configure:5445: result: yes -configure:5457: checking for int8_t -configure:5485: gcc -c -g -O2 conftest.c >&5 -configure:5492: $? = 0 -configure:5519: gcc -c -g -O2 conftest.c >&5 +configure:5441: result: yes +configure:5453: checking for int8_t +configure:5481: gcc -c -g -O2 conftest.c >&5 +configure:5488: $? = 0 +configure:5515: gcc -c -g -O2 conftest.c >&5 conftest.c: In function 'main': conftest.c:62: error: expected expression before ')' token -configure:5526: $? = 1 +configure:5522: $? = 1 configure: failed program was: | /* confdefs.h. */ | #define PACKAGE_NAME "brcm_iscsi" | #define PACKAGE_TARNAME "brcm_iscsi" -| #define PACKAGE_VERSION "0.3.0" -| #define PACKAGE_STRING "brcm_iscsi 0.3.0" +| #define PACKAGE_VERSION "0.4.3" +| #define PACKAGE_STRING "brcm_iscsi 0.4.3" | #define PACKAGE_BUGREPORT "benli@broadcom.com" | #define PACKAGE "" | #define VERSION "" @@ -2352,20 +2352,20 @@ configure: failed program was: | ; | return 0; | } -configure:5549: result: yes -configure:5560: checking for uint8_t -configure:5588: gcc -c -g -O2 conftest.c >&5 -configure:5595: $? = 0 -configure:5622: gcc -c -g -O2 conftest.c >&5 +configure:5545: result: yes +configure:5556: checking for uint8_t +configure:5584: gcc -c -g -O2 conftest.c >&5 +configure:5591: $? = 0 +configure:5618: gcc -c -g -O2 conftest.c >&5 conftest.c: In function 'main': conftest.c:63: error: expected expression before ')' token -configure:5629: $? = 1 +configure:5625: $? = 1 configure: failed program was: | /* confdefs.h. */ | #define PACKAGE_NAME "brcm_iscsi" | #define PACKAGE_TARNAME "brcm_iscsi" -| #define PACKAGE_VERSION "0.3.0" -| #define PACKAGE_STRING "brcm_iscsi 0.3.0" +| #define PACKAGE_VERSION "0.4.3" +| #define PACKAGE_STRING "brcm_iscsi 0.4.3" | #define PACKAGE_BUGREPORT "benli@broadcom.com" | #define PACKAGE "" | #define VERSION "" @@ -2428,20 +2428,20 @@ configure: failed program was: | ; | return 0; | } -configure:5652: result: yes -configure:5663: checking for int16_t -configure:5691: gcc -c -g -O2 conftest.c >&5 -configure:5698: $? = 0 -configure:5725: gcc -c -g -O2 conftest.c >&5 +configure:5648: result: yes +configure:5659: checking for int16_t +configure:5687: gcc -c -g -O2 conftest.c >&5 +configure:5694: $? = 0 +configure:5721: gcc -c -g -O2 conftest.c >&5 conftest.c: In function 'main': conftest.c:64: error: expected expression before ')' token -configure:5732: $? = 1 +configure:5728: $? = 1 configure: failed program was: | /* confdefs.h. */ | #define PACKAGE_NAME "brcm_iscsi" | #define PACKAGE_TARNAME "brcm_iscsi" -| #define PACKAGE_VERSION "0.3.0" -| #define PACKAGE_STRING "brcm_iscsi 0.3.0" +| #define PACKAGE_VERSION "0.4.3" +| #define PACKAGE_STRING "brcm_iscsi 0.4.3" | #define PACKAGE_BUGREPORT "benli@broadcom.com" | #define PACKAGE "" | #define VERSION "" @@ -2505,20 +2505,20 @@ configure: failed program was: | ; | return 0; | } -configure:5755: result: yes -configure:5766: checking for uint16_t -configure:5794: gcc -c -g -O2 conftest.c >&5 -configure:5801: $? = 0 -configure:5828: gcc -c -g -O2 conftest.c >&5 +configure:5751: result: yes +configure:5762: checking for uint16_t +configure:5790: gcc -c -g -O2 conftest.c >&5 +configure:5797: $? = 0 +configure:5824: gcc -c -g -O2 conftest.c >&5 conftest.c: In function 'main': conftest.c:65: error: expected expression before ')' token -configure:5835: $? = 1 +configure:5831: $? = 1 configure: failed program was: | /* confdefs.h. */ | #define PACKAGE_NAME "brcm_iscsi" | #define PACKAGE_TARNAME "brcm_iscsi" -| #define PACKAGE_VERSION "0.3.0" -| #define PACKAGE_STRING "brcm_iscsi 0.3.0" +| #define PACKAGE_VERSION "0.4.3" +| #define PACKAGE_STRING "brcm_iscsi 0.4.3" | #define PACKAGE_BUGREPORT "benli@broadcom.com" | #define PACKAGE "" | #define VERSION "" @@ -2583,20 +2583,20 @@ configure: failed program was: | ; | return 0; | } -configure:5858: result: yes -configure:5869: checking for int32_t -configure:5897: gcc -c -g -O2 conftest.c >&5 -configure:5904: $? = 0 -configure:5931: gcc -c -g -O2 conftest.c >&5 +configure:5854: result: yes +configure:5865: checking for int32_t +configure:5893: gcc -c -g -O2 conftest.c >&5 +configure:5900: $? = 0 +configure:5927: gcc -c -g -O2 conftest.c >&5 conftest.c: In function 'main': conftest.c:66: error: expected expression before ')' token -configure:5938: $? = 1 +configure:5934: $? = 1 configure: failed program was: | /* confdefs.h. */ | #define PACKAGE_NAME "brcm_iscsi" | #define PACKAGE_TARNAME "brcm_iscsi" -| #define PACKAGE_VERSION "0.3.0" -| #define PACKAGE_STRING "brcm_iscsi 0.3.0" +| #define PACKAGE_VERSION "0.4.3" +| #define PACKAGE_STRING "brcm_iscsi 0.4.3" | #define PACKAGE_BUGREPORT "benli@broadcom.com" | #define PACKAGE "" | #define VERSION "" @@ -2662,20 +2662,20 @@ configure: failed program was: | ; | return 0; | } -configure:5961: result: yes -configure:5972: checking for uint32_t -configure:6000: gcc -c -g -O2 conftest.c >&5 -configure:6007: $? = 0 -configure:6034: gcc -c -g -O2 conftest.c >&5 +configure:5957: result: yes +configure:5968: checking for uint32_t +configure:5996: gcc -c -g -O2 conftest.c >&5 +configure:6003: $? = 0 +configure:6030: gcc -c -g -O2 conftest.c >&5 conftest.c: In function 'main': conftest.c:67: error: expected expression before ')' token -configure:6041: $? = 1 +configure:6037: $? = 1 configure: failed program was: | /* confdefs.h. */ | #define PACKAGE_NAME "brcm_iscsi" | #define PACKAGE_TARNAME "brcm_iscsi" -| #define PACKAGE_VERSION "0.3.0" -| #define PACKAGE_STRING "brcm_iscsi 0.3.0" +| #define PACKAGE_VERSION "0.4.3" +| #define PACKAGE_STRING "brcm_iscsi 0.4.3" | #define PACKAGE_BUGREPORT "benli@broadcom.com" | #define PACKAGE "" | #define VERSION "" @@ -2742,20 +2742,20 @@ configure: failed program was: | ; | return 0; | } -configure:6064: result: yes -configure:6075: checking for int64_t -configure:6103: gcc -c -g -O2 conftest.c >&5 -configure:6110: $? = 0 -configure:6137: gcc -c -g -O2 conftest.c >&5 +configure:6060: result: yes +configure:6071: checking for int64_t +configure:6099: gcc -c -g -O2 conftest.c >&5 +configure:6106: $? = 0 +configure:6133: gcc -c -g -O2 conftest.c >&5 conftest.c: In function 'main': conftest.c:68: error: expected expression before ')' token -configure:6144: $? = 1 +configure:6140: $? = 1 configure: failed program was: | /* confdefs.h. */ | #define PACKAGE_NAME "brcm_iscsi" | #define PACKAGE_TARNAME "brcm_iscsi" -| #define PACKAGE_VERSION "0.3.0" -| #define PACKAGE_STRING "brcm_iscsi 0.3.0" +| #define PACKAGE_VERSION "0.4.3" +| #define PACKAGE_STRING "brcm_iscsi 0.4.3" | #define PACKAGE_BUGREPORT "benli@broadcom.com" | #define PACKAGE "" | #define VERSION "" @@ -2823,20 +2823,20 @@ configure: failed program was: | ; | return 0; | } -configure:6167: result: yes -configure:6178: checking for uint64_t -configure:6206: gcc -c -g -O2 conftest.c >&5 -configure:6213: $? = 0 -configure:6240: gcc -c -g -O2 conftest.c >&5 +configure:6163: result: yes +configure:6174: checking for uint64_t +configure:6202: gcc -c -g -O2 conftest.c >&5 +configure:6209: $? = 0 +configure:6236: gcc -c -g -O2 conftest.c >&5 conftest.c: In function 'main': conftest.c:69: error: expected expression before ')' token -configure:6247: $? = 1 +configure:6243: $? = 1 configure: failed program was: | /* confdefs.h. */ | #define PACKAGE_NAME "brcm_iscsi" | #define PACKAGE_TARNAME "brcm_iscsi" -| #define PACKAGE_VERSION "0.3.0" -| #define PACKAGE_STRING "brcm_iscsi 0.3.0" +| #define PACKAGE_VERSION "0.4.3" +| #define PACKAGE_STRING "brcm_iscsi 0.4.3" | #define PACKAGE_BUGREPORT "benli@broadcom.com" | #define PACKAGE "" | #define VERSION "" @@ -2905,35 +2905,35 @@ configure: failed program was: | ; | return 0; | } -configure:6270: result: yes -configure:6285: checking size of short -configure:6590: gcc -o conftest -g -O2 conftest.c >&5 -configure:6594: $? = 0 -configure:6600: ./conftest -configure:6604: $? = 0 -configure:6630: result: 2 -configure:6644: checking size of int -configure:6949: gcc -o conftest -g -O2 conftest.c >&5 -configure:6953: $? = 0 -configure:6959: ./conftest -configure:6963: $? = 0 -configure:6989: result: 4 -configure:7003: checking size of long -configure:7308: gcc -o conftest -g -O2 conftest.c >&5 -configure:7312: $? = 0 -configure:7318: ./conftest -configure:7322: $? = 0 -configure:7348: result: 8 -configure:7360: checking whether byte ordering is bigendian -configure:7385: gcc -c -g -O2 conftest.c >&5 +configure:6266: result: yes +configure:6281: checking size of short +configure:6586: gcc -o conftest -g -O2 conftest.c >&5 +configure:6590: $? = 0 +configure:6596: ./conftest +configure:6600: $? = 0 +configure:6626: result: 2 +configure:6640: checking size of int +configure:6945: gcc -o conftest -g -O2 conftest.c >&5 +configure:6949: $? = 0 +configure:6955: ./conftest +configure:6959: $? = 0 +configure:6985: result: 4 +configure:6999: checking size of long +configure:7304: gcc -o conftest -g -O2 conftest.c >&5 +configure:7308: $? = 0 +configure:7314: ./conftest +configure:7318: $? = 0 +configure:7344: result: 8 +configure:7356: checking whether byte ordering is bigendian +configure:7381: gcc -c -g -O2 conftest.c >&5 conftest.c:38: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'a' -configure:7392: $? = 1 +configure:7388: $? = 1 configure: failed program was: | /* confdefs.h. */ | #define PACKAGE_NAME "brcm_iscsi" | #define PACKAGE_TARNAME "brcm_iscsi" -| #define PACKAGE_VERSION "0.3.0" -| #define PACKAGE_STRING "brcm_iscsi 0.3.0" +| #define PACKAGE_VERSION "0.4.3" +| #define PACKAGE_STRING "brcm_iscsi 0.4.3" | #define PACKAGE_BUGREPORT "benli@broadcom.com" | #define PACKAGE "" | #define VERSION "" @@ -2970,21 +2970,21 @@ configure: failed program was: | #endif | typedef int dummy; | -configure:7442: gcc -c -g -O2 conftest.c >&5 -configure:7449: $? = 0 -configure:7481: gcc -c -g -O2 conftest.c >&5 +configure:7438: gcc -c -g -O2 conftest.c >&5 +configure:7445: $? = 0 +configure:7477: gcc -c -g -O2 conftest.c >&5 conftest.c: In function 'main': conftest.c:44: error: 'not' undeclared (first use in this function) conftest.c:44: error: (Each undeclared identifier is reported only once conftest.c:44: error: for each function it appears in.) conftest.c:44: error: expected ';' before 'big' -configure:7488: $? = 1 +configure:7484: $? = 1 configure: failed program was: | /* confdefs.h. */ | #define PACKAGE_NAME "brcm_iscsi" | #define PACKAGE_TARNAME "brcm_iscsi" -| #define PACKAGE_VERSION "0.3.0" -| #define PACKAGE_STRING "brcm_iscsi 0.3.0" +| #define PACKAGE_VERSION "0.4.3" +| #define PACKAGE_STRING "brcm_iscsi 0.4.3" | #define PACKAGE_BUGREPORT "benli@broadcom.com" | #define PACKAGE "" | #define VERSION "" @@ -3029,112 +3029,112 @@ configure: failed program was: | ; | return 0; | } -configure:7740: result: no -configure:7802: checking build system type -configure:7820: result: x86_64-unknown-linux-gnu -configure:7842: checking host system type -configure:7857: result: x86_64-unknown-linux-gnu -configure:7879: checking for a sed that does not truncate output -configure:7945: result: /bin/sed -configure:7963: checking for fgrep -configure:8027: result: /bin/grep -F -configure:8062: checking for ld used by gcc -configure:8129: result: /usr/x86_64-pc-linux-gnu/bin/ld -configure:8138: checking if the linker (/usr/x86_64-pc-linux-gnu/bin/ld) is GNU ld -configure:8153: result: yes -configure:8165: checking for BSD- or MS-compatible name lister (nm) -configure:8214: result: /usr/bin/nm -B -configure:8332: checking the name lister (/usr/bin/nm -B) interface -configure:8339: gcc -c -g -O2 conftest.c >&5 -configure:8342: /usr/bin/nm -B "conftest.o" -configure:8345: output +configure:7736: result: no +configure:7798: checking build system type +configure:7816: result: x86_64-unknown-linux-gnu +configure:7838: checking host system type +configure:7853: result: x86_64-unknown-linux-gnu +configure:7875: checking for a sed that does not truncate output +configure:7941: result: /bin/sed +configure:7959: checking for fgrep +configure:8023: result: /bin/grep -F +configure:8058: checking for ld used by gcc +configure:8125: result: /usr/x86_64-pc-linux-gnu/bin/ld +configure:8134: checking if the linker (/usr/x86_64-pc-linux-gnu/bin/ld) is GNU ld +configure:8149: result: yes +configure:8161: checking for BSD- or MS-compatible name lister (nm) +configure:8210: result: /usr/bin/nm -B +configure:8328: checking the name lister (/usr/bin/nm -B) interface +configure:8335: gcc -c -g -O2 conftest.c >&5 +configure:8338: /usr/bin/nm -B "conftest.o" +configure:8341: output 0000000000000000 B some_variable -configure:8352: result: BSD nm -configure:8355: checking whether ln -s works -configure:8359: result: yes -configure:8367: checking the maximum length of command line arguments -configure:8487: result: 3458764513820540925 -configure:8504: checking whether the shell understands some XSI constructs -configure:8514: result: yes -configure:8518: checking whether the shell understands "+=" -configure:8524: result: yes -configure:8559: checking for /usr/x86_64-pc-linux-gnu/bin/ld option to reload object files -configure:8566: result: -r -configure:8635: checking for objdump -configure:8651: found /usr/bin/objdump -configure:8662: result: objdump -configure:8694: checking how to recognize dependent libraries -configure:8890: result: pass_all -configure:8950: checking for ar -configure:8966: found /usr/bin/ar -configure:8977: result: ar -configure:9055: checking for strip -configure:9071: found /usr/bin/strip -configure:9082: result: strip -configure:9154: checking for ranlib -configure:9170: found /usr/bin/ranlib -configure:9181: result: ranlib -configure:9271: checking command to parse /usr/bin/nm -B output from gcc object -configure:9389: gcc -c -g -O2 conftest.c >&5 -configure:9392: $? = 0 -configure:9396: /usr/bin/nm -B conftest.o \| sed -n -e 's/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' \> conftest.nm -configure:9399: $? = 0 -configure:9453: gcc -o conftest -g -O2 conftest.c conftstm.o >&5 -configure:9456: $? = 0 -configure:9494: result: ok -configure:9589: gcc -c -g -O2 conftest.c >&5 -configure:9592: $? = 0 -configure:10359: checking for dlfcn.h -configure:10380: gcc -c -g -O2 conftest.c >&5 -configure:10387: $? = 0 -configure:10404: result: yes -configure:10588: checking for objdir -configure:10603: result: .libs -configure:10895: checking if gcc supports -fno-rtti -fno-exceptions -configure:10913: gcc -c -g -O2 -fno-rtti -fno-exceptions conftest.c >&5 +configure:8348: result: BSD nm +configure:8351: checking whether ln -s works +configure:8355: result: yes +configure:8363: checking the maximum length of command line arguments +configure:8483: result: 1572864 +configure:8500: checking whether the shell understands some XSI constructs +configure:8510: result: yes +configure:8514: checking whether the shell understands "+=" +configure:8520: result: yes +configure:8555: checking for /usr/x86_64-pc-linux-gnu/bin/ld option to reload object files +configure:8562: result: -r +configure:8631: checking for objdump +configure:8647: found /usr/bin/objdump +configure:8658: result: objdump +configure:8690: checking how to recognize dependent libraries +configure:8886: result: pass_all +configure:8946: checking for ar +configure:8962: found /usr/bin/ar +configure:8973: result: ar +configure:9051: checking for strip +configure:9067: found /usr/bin/strip +configure:9078: result: strip +configure:9150: checking for ranlib +configure:9166: found /usr/bin/ranlib +configure:9177: result: ranlib +configure:9267: checking command to parse /usr/bin/nm -B output from gcc object +configure:9385: gcc -c -g -O2 conftest.c >&5 +configure:9388: $? = 0 +configure:9392: /usr/bin/nm -B conftest.o \| sed -n -e 's/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' \> conftest.nm +configure:9395: $? = 0 +configure:9449: gcc -o conftest -g -O2 conftest.c conftstm.o >&5 +configure:9452: $? = 0 +configure:9490: result: ok +configure:9585: gcc -c -g -O2 conftest.c >&5 +configure:9588: $? = 0 +configure:10355: checking for dlfcn.h +configure:10376: gcc -c -g -O2 conftest.c >&5 +configure:10383: $? = 0 +configure:10400: result: yes +configure:10584: checking for objdir +configure:10599: result: .libs +configure:10891: checking if gcc supports -fno-rtti -fno-exceptions +configure:10909: gcc -c -g -O2 -fno-rtti -fno-exceptions conftest.c >&5 cc1: warning: command line option "-fno-rtti" is valid for C++/ObjC++ but not for C -configure:10917: $? = 0 -configure:10930: result: no -configure:10950: checking for gcc option to produce PIC -configure:11222: result: -fPIC -DPIC -configure:11234: checking if gcc PIC flag -fPIC -DPIC works -configure:11252: gcc -c -g -O2 -fPIC -DPIC -DPIC conftest.c >&5 -configure:11256: $? = 0 -configure:11269: result: yes -configure:11293: checking if gcc static flag -static works -configure:11321: result: yes -configure:11336: checking if gcc supports -c -o file.o -configure:11357: gcc -c -g -O2 -o out/conftest2.o conftest.c >&5 -configure:11361: $? = 0 -configure:11383: result: yes -configure:11391: checking if gcc supports -c -o file.o -configure:11438: result: yes -configure:11471: checking whether the gcc linker (/usr/x86_64-pc-linux-gnu/bin/ld -m elf_x86_64) supports shared libraries -configure:12545: result: yes -configure:12582: checking whether -lc should be explicitly linked in -configure:12587: gcc -c -g -O2 conftest.c >&5 -configure:12590: $? = 0 -configure:12605: gcc -shared conftest.o -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| /bin/grep -lc \>/dev/null 2\>\&1 -configure:12608: $? = 0 -configure:12620: result: no -configure:12784: checking dynamic linker characteristics -configure:13240: gcc -o conftest -g -O2 -Wl,-rpath -Wl,/foo conftest.c >&5 -configure:13247: $? = 0 -configure:13480: result: GNU/Linux ld.so -configure:13582: checking how to hardcode library paths into programs -configure:13607: result: immediate -configure:13730: checking for shl_load -configure:13786: gcc -o conftest -g -O2 conftest.c >&5 -/tmp/ccqrFxgZ.o: In function `main': -/home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/conftest.c:73: undefined reference to `shl_load' +configure:10913: $? = 0 +configure:10926: result: no +configure:10946: checking for gcc option to produce PIC +configure:11218: result: -fPIC -DPIC +configure:11230: checking if gcc PIC flag -fPIC -DPIC works +configure:11248: gcc -c -g -O2 -fPIC -DPIC -DPIC conftest.c >&5 +configure:11252: $? = 0 +configure:11265: result: yes +configure:11289: checking if gcc static flag -static works +configure:11317: result: yes +configure:11332: checking if gcc supports -c -o file.o +configure:11353: gcc -c -g -O2 -o out/conftest2.o conftest.c >&5 +configure:11357: $? = 0 +configure:11379: result: yes +configure:11387: checking if gcc supports -c -o file.o +configure:11434: result: yes +configure:11467: checking whether the gcc linker (/usr/x86_64-pc-linux-gnu/bin/ld -m elf_x86_64) supports shared libraries +configure:12541: result: yes +configure:12578: checking whether -lc should be explicitly linked in +configure:12583: gcc -c -g -O2 conftest.c >&5 +configure:12586: $? = 0 +configure:12601: gcc -shared conftest.o -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| /bin/grep -lc \>/dev/null 2\>\&1 +configure:12604: $? = 0 +configure:12616: result: no +configure:12780: checking dynamic linker characteristics +configure:13236: gcc -o conftest -g -O2 -Wl,-rpath -Wl,/foo conftest.c >&5 +configure:13243: $? = 0 +configure:13476: result: GNU/Linux ld.so +configure:13578: checking how to hardcode library paths into programs +configure:13603: result: immediate +configure:13726: checking for shl_load +configure:13782: gcc -o conftest -g -O2 conftest.c >&5 +/tmp/cc6EkTSx.o: In function `main': +/tmp/brcm_iscsi_uio-0.4.3/conftest.c:73: undefined reference to `shl_load' collect2: ld returned 1 exit status -configure:13793: $? = 1 +configure:13789: $? = 1 configure: failed program was: | /* confdefs.h. */ | #define PACKAGE_NAME "brcm_iscsi" | #define PACKAGE_TARNAME "brcm_iscsi" -| #define PACKAGE_VERSION "0.3.0" -| #define PACKAGE_STRING "brcm_iscsi 0.3.0" +| #define PACKAGE_VERSION "0.4.3" +| #define PACKAGE_STRING "brcm_iscsi 0.4.3" | #define PACKAGE_BUGREPORT "benli@broadcom.com" | #define PACKAGE "" | #define VERSION "" @@ -3206,18 +3206,18 @@ configure: failed program was: | ; | return 0; | } -configure:13813: result: no -configure:13818: checking for shl_load in -ldld -configure:13853: gcc -o conftest -g -O2 conftest.c -ldld >&5 +configure:13809: result: no +configure:13814: checking for shl_load in -ldld +configure:13849: gcc -o conftest -g -O2 conftest.c -ldld >&5 /usr/lib/gcc/x86_64-pc-linux-gnu/4.3.3/../../../../x86_64-pc-linux-gnu/bin/ld: cannot find -ldld collect2: ld returned 1 exit status -configure:13860: $? = 1 +configure:13856: $? = 1 configure: failed program was: | /* confdefs.h. */ | #define PACKAGE_NAME "brcm_iscsi" | #define PACKAGE_TARNAME "brcm_iscsi" -| #define PACKAGE_VERSION "0.3.0" -| #define PACKAGE_STRING "brcm_iscsi 0.3.0" +| #define PACKAGE_VERSION "0.4.3" +| #define PACKAGE_STRING "brcm_iscsi 0.4.3" | #define PACKAGE_BUGREPORT "benli@broadcom.com" | #define PACKAGE "" | #define VERSION "" @@ -3266,19 +3266,19 @@ configure: failed program was: | ; | return 0; | } -configure:13881: result: no -configure:13886: checking for dlopen -configure:13942: gcc -o conftest -g -O2 conftest.c >&5 -/tmp/ccsgFxMc.o: In function `main': -/home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/conftest.c:73: undefined reference to `dlopen' +configure:13877: result: no +configure:13882: checking for dlopen +configure:13938: gcc -o conftest -g -O2 conftest.c >&5 +/tmp/cc2OmsLO.o: In function `main': +/tmp/brcm_iscsi_uio-0.4.3/conftest.c:73: undefined reference to `dlopen' collect2: ld returned 1 exit status -configure:13949: $? = 1 +configure:13945: $? = 1 configure: failed program was: | /* confdefs.h. */ | #define PACKAGE_NAME "brcm_iscsi" | #define PACKAGE_TARNAME "brcm_iscsi" -| #define PACKAGE_VERSION "0.3.0" -| #define PACKAGE_STRING "brcm_iscsi 0.3.0" +| #define PACKAGE_VERSION "0.4.3" +| #define PACKAGE_STRING "brcm_iscsi 0.4.3" | #define PACKAGE_BUGREPORT "benli@broadcom.com" | #define PACKAGE "" | #define VERSION "" @@ -3350,31 +3350,59 @@ configure: failed program was: | ; | return 0; | } -configure:13969: result: no -configure:13974: checking for dlopen in -ldl -configure:14009: gcc -o conftest -g -O2 conftest.c -ldl >&5 -configure:14016: $? = 0 -configure:14037: result: yes -configure:14214: checking whether a program can dlopen itself -configure:14284: gcc -o conftest -g -O2 -DHAVE_DLFCN_H -Wl,--export-dynamic conftest.c -ldl >&5 -configure:14287: $? = 0 -configure:14305: result: yes -configure:14310: checking whether a statically linked program can dlopen itself -configure:14380: gcc -o conftest -g -O2 -DHAVE_DLFCN_H -Wl,--export-dynamic -static conftest.c -ldl >&5 -/tmp/cc21eSPh.o: In function `main': -/home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/configure:14364: warning: Using 'dlopen' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking -configure:14383: $? = 0 +configure:13965: result: no +configure:13970: checking for dlopen in -ldl +configure:14005: gcc -o conftest -g -O2 conftest.c -ldl >&5 +configure:14012: $? = 0 +configure:14033: result: yes +configure:14210: checking whether a program can dlopen itself +configure:14280: gcc -o conftest -g -O2 -DHAVE_DLFCN_H -Wl,--export-dynamic conftest.c -ldl >&5 +configure:14283: $? = 0 +configure:14301: result: yes +configure:14306: checking whether a statically linked program can dlopen itself +configure:14376: gcc -o conftest -g -O2 -DHAVE_DLFCN_H -Wl,--export-dynamic -static conftest.c -ldl >&5 +/tmp/ccs2qVbg.o: In function `main': +/tmp/brcm_iscsi_uio-0.4.3/configure:14360: warning: Using 'dlopen' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking +configure:14379: $? = 0 /lib64/: cannot read file data: Is a directory -configure:14401: result: no -configure:14440: checking whether stripping libraries is possible -configure:14445: result: yes -configure:14480: checking if libtool supports shared libraries -configure:14482: result: yes -configure:14485: checking whether to build shared libraries -configure:14506: result: yes -configure:14509: checking whether to build static libraries -configure:14513: result: yes -configure:14723: creating ./config.status +configure:14397: result: no +configure:14436: checking whether stripping libraries is possible +configure:14441: result: yes +configure:14476: checking if libtool supports shared libraries +configure:14478: result: yes +configure:14481: checking whether to build shared libraries +configure:14502: result: yes +configure:14505: checking whether to build static libraries +configure:14509: result: yes +configure:14693: creating ./config.status + +## ---------------------- ## +## Running config.status. ## +## ---------------------- ## + +This file was extended by brcm_iscsi config.status 0.4.3, which was +generated by GNU Autoconf 2.63. Invocation command line was + + CONFIG_FILES = + CONFIG_HEADERS = + CONFIG_LINKS = + CONFIG_COMMANDS = + $ ./config.status + +on localhost + +config.status:1016: creating Makefile +config.status:1016: creating src/Makefile +config.status:1016: creating src/apps/Makefile +config.status:1016: creating src/apps/dhcpc/Makefile +config.status:1016: creating src/apps/brcm-iscsi/Makefile +config.status:1016: creating src/uip/Makefile +config.status:1016: creating src/unix/Makefile +config.status:1016: creating src/unix/libs/Makefile +config.status:1016: creating config.h +config.status:1290: executing depfiles commands +config.status:1290: executing libtool commands +config.status:1290: executing default commands ## ---------------- ## ## Cache variables. ## @@ -3485,21 +3513,21 @@ lt_cv_sys_global_symbol_pipe='sed -n -e lt_cv_sys_global_symbol_to_c_name_address='sed -n -e '\''s/^: \([^ ]*\) $/ {\"\1\", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \([^ ]*\)$/ {"\2", (void *) \&\2},/p'\''' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='sed -n -e '\''s/^: \([^ ]*\) $/ {\"\1\", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \(lib[^ ]*\)$/ {"\2", (void *) \&\2},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \([^ ]*\)$/ {"lib\2", (void *) \&\2},/p'\''' lt_cv_sys_global_symbol_to_cdecl='sed -n -e '\''s/^T .* \(.*\)$/extern int \1();/p'\'' -e '\''s/^[ABCDGIRSTW]* .* \(.*\)$/extern char \1;/p'\''' -lt_cv_sys_max_cmd_len=3458764513820540925 +lt_cv_sys_max_cmd_len=1572864 ## ----------------- ## ## Output variables. ## ## ----------------- ## -ACLOCAL='${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run aclocal-1.10' +ACLOCAL='${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run aclocal-1.10' AMDEPBACKSLASH='\' AMDEP_FALSE='#' AMDEP_TRUE='' -AMTAR='${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run tar' +AMTAR='${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run tar' AR='ar' -AUTOCONF='${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run autoconf' -AUTOHEADER='${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run autoheader' -AUTOMAKE='${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run automake-1.10' +AUTOCONF='${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run autoconf' +AUTOHEADER='${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run autoheader' +AUTOMAKE='${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run automake-1.10' AWK='gawk' BASH='/bin/sh' CC='gcc' @@ -3518,8 +3546,6 @@ ECHO_C='' ECHO_N='-n' ECHO_T='' EGREP='/bin/grep -E' -ENABLE_PACKET_CAPTURE_FALSE='' -ENABLE_PACKET_CAPTURE_TRUE='#' ENDIAN='LITTLE' EXEEXT='' FGREP='/bin/grep -F' @@ -3539,7 +3565,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo LIPO='' LN_S='ln -s' LTLIBOBJS='' -MAKEINFO='${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run makeinfo' +MAKEINFO='${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run makeinfo' MKDIR_P='/bin/mkdir -p' NM='/usr/bin/nm -B' NMEDIT='' @@ -3550,9 +3576,9 @@ OTOOL='' PACKAGE='' PACKAGE_BUGREPORT='benli@broadcom.com' PACKAGE_NAME='brcm_iscsi' -PACKAGE_STRING='brcm_iscsi 0.3.0' +PACKAGE_STRING='brcm_iscsi 0.4.3' PACKAGE_TARNAME='brcm_iscsi' -PACKAGE_VERSION='0.3.0' +PACKAGE_VERSION='0.4.3' PATH_SEPARATOR=':' RANLIB='ranlib' SED='/bin/sed' @@ -3591,7 +3617,7 @@ host_vendor='unknown' htmldir='${docdir}' includedir='${prefix}/include' infodir='${datarootdir}/info' -install_sh='$(SHELL) /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/install-sh' +install_sh='$(SHELL) /tmp/brcm_iscsi_uio-0.4.3/install-sh' libdir='${exec_prefix}/lib' libexecdir='${exec_prefix}/libexec' localedir='${datarootdir}/locale' @@ -3615,8 +3641,8 @@ target_alias='' #define PACKAGE_NAME "brcm_iscsi" #define PACKAGE_TARNAME "brcm_iscsi" -#define PACKAGE_VERSION "0.3.0" -#define PACKAGE_STRING "brcm_iscsi 0.3.0" +#define PACKAGE_VERSION "0.4.3" +#define PACKAGE_STRING "brcm_iscsi 0.4.3" #define PACKAGE_BUGREPORT "benli@broadcom.com" #define PACKAGE "" #define VERSION "" @@ -3651,32 +3677,3 @@ target_alias='' #define LT_OBJDIR ".libs/" configure: exit 0 - -## ---------------------- ## -## Running config.status. ## -## ---------------------- ## - -This file was extended by brcm_iscsi config.status 0.3.0, which was -generated by GNU Autoconf 2.63. Invocation command line was - - CONFIG_FILES = - CONFIG_HEADERS = - CONFIG_LINKS = - CONFIG_COMMANDS = - $ ./config.status - -on dhcp-10-12-136-116 - -config.status:1018: creating Makefile -config.status:1018: creating src/Makefile -config.status:1018: creating src/apps/Makefile -config.status:1018: creating src/apps/dhcpc/Makefile -config.status:1018: creating src/apps/brcm-iscsi/Makefile -config.status:1018: creating src/uip/Makefile -config.status:1018: creating src/unix/Makefile -config.status:1018: creating src/unix/libs/Makefile -config.status:1018: creating config.h -config.status:1240: config.h is unchanged -config.status:1292: executing depfiles commands -config.status:1292: executing libtool commands -config.status:1292: executing default commands diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/config.status open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/config.status --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/config.status 2009-06-18 16:06:56.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/config.status 2009-07-28 15:10:36.000000000 -0500 @@ -309,7 +309,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by brcm_iscsi $as_me 0.3.0, which was +This file was extended by brcm_iscsi $as_me 0.4.3, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -355,7 +355,7 @@ $config_commands Report bugs to <bug-autoconf@gnu.org>." ac_cs_version="\ -brcm_iscsi config.status 0.3.0 +brcm_iscsi config.status 0.4.3 configured by ./configure, generated by GNU Autoconf 2.63, with options \"\" @@ -363,7 +363,7 @@ Copyright (C) 2008 Free Software Foundat This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -ac_pwd='/home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio' +ac_pwd='/tmp/brcm_iscsi_uio-0.4.3' srcdir='.' INSTALL='/usr/bin/install -c' MKDIR_P='/bin/mkdir -p' @@ -489,7 +489,7 @@ FGREP='/bin/grep -F' LD='/usr/x86_64-pc-linux-gnu/bin/ld -m elf_x86_64' NM='/usr/bin/nm -B' LN_S='ln -s' -max_cmd_len='3458764513820540925' +max_cmd_len='1572864' ac_objext='o' exeext='' lt_unset='unset' @@ -728,8 +728,6 @@ echo 'BEGIN {' >"$tmp/subs1.awk" && cat >>"$tmp/subs1.awk" <<\_ACAWK && S["LTLIBOBJS"]="" S["LIBOBJS"]="" -S["ENABLE_PACKET_CAPTURE_FALSE"]="" -S["ENABLE_PACKET_CAPTURE_TRUE"]="#" S["DEBUG_FALSE"]="" S["DEBUG_TRUE"]="#" S["OTOOL64"]="" @@ -785,7 +783,7 @@ S["CC"]="gcc" S["BASH"]="/bin/sh" S["am__untar"]="${AMTAR} xf -" S["am__tar"]="${AMTAR} chof - \"$$tardir\"" -S["AMTAR"]="${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run tar" +S["AMTAR"]="${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run tar" S["am__leading_dot"]="." S["SET_MAKE"]="" S["AWK"]="gawk" @@ -793,12 +791,12 @@ S["mkdir_p"]="/bin/mkdir -p" S["MKDIR_P"]="/bin/mkdir -p" S["INSTALL_STRIP_PROGRAM"]="$(install_sh) -c -s" S["STRIP"]="strip" -S["install_sh"]="$(SHELL) /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/install-sh" -S["MAKEINFO"]="${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run makeinfo" -S["AUTOHEADER"]="${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run autoheader" -S["AUTOMAKE"]="${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run automake-1.10" -S["AUTOCONF"]="${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run autoconf" -S["ACLOCAL"]="${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run aclocal-1.10" +S["install_sh"]="$(SHELL) /tmp/brcm_iscsi_uio-0.4.3/install-sh" +S["MAKEINFO"]="${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run makeinfo" +S["AUTOHEADER"]="${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run autoheader" +S["AUTOMAKE"]="${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run automake-1.10" +S["AUTOCONF"]="${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run autoconf" +S["ACLOCAL"]="${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run aclocal-1.10" S["VERSION"]="" S["PACKAGE"]="" S["CYGPATH_W"]="echo" @@ -837,8 +835,8 @@ S["program_transform_name"]="s,x,x," S["prefix"]="/usr/local" S["exec_prefix"]="${prefix}" S["PACKAGE_BUGREPORT"]="benli@broadcom.com" -S["PACKAGE_STRING"]="brcm_iscsi 0.3.0" -S["PACKAGE_VERSION"]="0.3.0" +S["PACKAGE_STRING"]="brcm_iscsi 0.4.3" +S["PACKAGE_VERSION"]="0.4.3" S["PACKAGE_TARNAME"]="brcm_iscsi" S["PACKAGE_NAME"]="brcm_iscsi" S["PATH_SEPARATOR"]=":" @@ -888,8 +886,8 @@ cat >"$tmp/defines.awk" <<\_ACAWK || BEGIN { D["PACKAGE_NAME"]=" \"brcm_iscsi\"" D["PACKAGE_TARNAME"]=" \"brcm_iscsi\"" -D["PACKAGE_VERSION"]=" \"0.3.0\"" -D["PACKAGE_STRING"]=" \"brcm_iscsi 0.3.0\"" +D["PACKAGE_VERSION"]=" \"0.4.3\"" +D["PACKAGE_STRING"]=" \"brcm_iscsi 0.4.3\"" D["PACKAGE_BUGREPORT"]=" \"benli@broadcom.com\"" D["PACKAGE"]=" \"\"" D["VERSION"]=" \"\"" diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/configure open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/configure --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/configure 2009-06-18 17:20:39.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/configure 2009-07-28 15:10:36.000000000 -0500 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for brcm_iscsi 0.4.0. +# Generated by GNU Autoconf 2.63 for brcm_iscsi 0.4.3. # # Report bugs to <benli@broadcom.com>. # @@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='brcm_iscsi' PACKAGE_TARNAME='brcm_iscsi' -PACKAGE_VERSION='0.4.0' -PACKAGE_STRING='brcm_iscsi 0.4.0' +PACKAGE_VERSION='0.4.3' +PACKAGE_STRING='brcm_iscsi 0.4.3' PACKAGE_BUGREPORT='benli@broadcom.com' # Factoring default headers for most tests. @@ -1475,7 +1475,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures brcm_iscsi 0.4.0 to adapt to many kinds of systems. +\`configure' configures brcm_iscsi 0.4.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1545,7 +1545,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of brcm_iscsi 0.4.0:";; + short | recursive ) echo "Configuration of brcm_iscsi 0.4.3:";; esac cat <<\_ACEOF @@ -1650,7 +1650,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -brcm_iscsi configure 0.4.0 +brcm_iscsi configure 0.4.3 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1664,7 +1664,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by brcm_iscsi $as_me 0.4.0, which was +It was created by brcm_iscsi $as_me 0.4.3, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -15007,7 +15007,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by brcm_iscsi $as_me 0.4.0, which was +This file was extended by brcm_iscsi $as_me 0.4.3, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15070,7 +15070,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -brcm_iscsi config.status 0.4.0 +brcm_iscsi config.status 0.4.3 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/configure.ac open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/configure.ac --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/configure.ac 2009-06-18 17:20:25.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/configure.ac 2009-07-28 15:10:36.000000000 -0500 @@ -10,9 +10,9 @@ dnl Written by: Benjamin Li (benli@broa dnl PACKAGE=brcm_iscsiuio -VERSION=0.4.0 +VERSION=0.4.3 -AC_INIT(brcm_iscsi, 0.4.0, benli@broadcom.com) +AC_INIT(brcm_iscsi, 0.4.3, benli@broadcom.com) AM_INIT_AUTOMAKE($PACKAGE, $VERSION) AC_CONFIG_HEADER(config.h) diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/Makefile open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/Makefile --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/Makefile 2009-06-18 16:06:56.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/Makefile 2009-07-28 15:10:36.000000000 -0500 @@ -71,12 +71,12 @@ DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print -ACLOCAL = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run aclocal-1.10 -AMTAR = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run tar +ACLOCAL = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run aclocal-1.10 +AMTAR = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run tar AR = ar -AUTOCONF = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run autoconf -AUTOHEADER = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run autoheader -AUTOMAKE = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run automake-1.10 +AUTOCONF = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run autoconf +AUTOHEADER = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run autoheader +AUTOMAKE = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run automake-1.10 AWK = gawk BASH = /bin/sh CC = gcc @@ -113,7 +113,7 @@ LIBTOOL = $(SHELL) $(top_builddir)/libto LIPO = LN_S = ln -s LTLIBOBJS = -MAKEINFO = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run makeinfo +MAKEINFO = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run makeinfo MKDIR_P = /bin/mkdir -p NM = /usr/bin/nm -B NMEDIT = @@ -124,9 +124,9 @@ OTOOL64 = PACKAGE = PACKAGE_BUGREPORT = benli@broadcom.com PACKAGE_NAME = brcm_iscsi -PACKAGE_STRING = brcm_iscsi 0.3.0 +PACKAGE_STRING = brcm_iscsi 0.4.3 PACKAGE_TARNAME = brcm_iscsi -PACKAGE_VERSION = 0.3.0 +PACKAGE_VERSION = 0.4.3 PATH_SEPARATOR = : RANLIB = ranlib SED = /bin/sed @@ -136,10 +136,10 @@ STRIP = strip VERSION = YACC = bison -y YFLAGS = -abs_builddir = /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio -abs_srcdir = /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio -abs_top_builddir = /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio -abs_top_srcdir = /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio +abs_builddir = /tmp/brcm_iscsi_uio-0.4.3 +abs_srcdir = /tmp/brcm_iscsi_uio-0.4.3 +abs_top_builddir = /tmp/brcm_iscsi_uio-0.4.3 +abs_top_srcdir = /tmp/brcm_iscsi_uio-0.4.3 ac_ct_CC = gcc ac_ct_DUMPBIN = am__include = include @@ -167,7 +167,7 @@ host_vendor = unknown htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = $(SHELL) /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/install-sh +install_sh = $(SHELL) /tmp/brcm_iscsi_uio-0.4.3/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/README open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/README --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/README 2009-06-18 17:19:45.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/README 2009-07-28 15:10:36.000000000 -0500 @@ -1,6 +1,6 @@ Broadcom iSCSI Userspace Tools -Version 0.4.0 -June 17, 2008 +Version 0.4.3 +July 28, 2009 ------------------------------------------------------ This tools is to be used in conjunction with the Broadcom NetXtreme II Linux @@ -94,3 +94,5 @@ Limitations: Any packets larger then the buffer size will not be sent/received by the hardware and will be dropped. + +There is no IPv6 support. diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/apps/brcm-iscsi/Makefile open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/apps/brcm-iscsi/Makefile --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/apps/brcm-iscsi/Makefile 2009-06-18 16:06:57.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/apps/brcm-iscsi/Makefile 2009-07-28 15:10:36.000000000 -0500 @@ -66,12 +66,12 @@ DIST_SOURCES = $(libbrcm_apps_brcm_iscsi ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run aclocal-1.10 -AMTAR = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run tar +ACLOCAL = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run aclocal-1.10 +AMTAR = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run tar AR = ar -AUTOCONF = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run autoconf -AUTOHEADER = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run autoheader -AUTOMAKE = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run automake-1.10 +AUTOCONF = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run autoconf +AUTOHEADER = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run autoheader +AUTOMAKE = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run automake-1.10 AWK = gawk BASH = /bin/sh CC = gcc @@ -108,7 +108,7 @@ LIBTOOL = $(SHELL) $(top_builddir)/libto LIPO = LN_S = ln -s LTLIBOBJS = -MAKEINFO = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run makeinfo +MAKEINFO = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run makeinfo MKDIR_P = /bin/mkdir -p NM = /usr/bin/nm -B NMEDIT = @@ -119,9 +119,9 @@ OTOOL64 = PACKAGE = PACKAGE_BUGREPORT = benli@broadcom.com PACKAGE_NAME = brcm_iscsi -PACKAGE_STRING = brcm_iscsi 0.3.0 +PACKAGE_STRING = brcm_iscsi 0.4.3 PACKAGE_TARNAME = brcm_iscsi -PACKAGE_VERSION = 0.3.0 +PACKAGE_VERSION = 0.4.3 PATH_SEPARATOR = : RANLIB = ranlib SED = /bin/sed @@ -131,10 +131,10 @@ STRIP = strip VERSION = YACC = bison -y YFLAGS = -abs_builddir = /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/src/apps/brcm-iscsi -abs_srcdir = /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/src/apps/brcm-iscsi -abs_top_builddir = /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio -abs_top_srcdir = /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio +abs_builddir = /tmp/brcm_iscsi_uio-0.4.3/src/apps/brcm-iscsi +abs_srcdir = /tmp/brcm_iscsi_uio-0.4.3/src/apps/brcm-iscsi +abs_top_builddir = /tmp/brcm_iscsi_uio-0.4.3 +abs_top_srcdir = /tmp/brcm_iscsi_uio-0.4.3 ac_ct_CC = gcc ac_ct_DUMPBIN = am__include = include @@ -162,7 +162,7 @@ host_vendor = unknown htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = $(SHELL) /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/install-sh +install_sh = $(SHELL) /tmp/brcm_iscsi_uio-0.4.3/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/apps/dhcpc/Makefile open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/apps/dhcpc/Makefile --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/apps/dhcpc/Makefile 2009-06-18 16:06:57.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/apps/dhcpc/Makefile 2009-07-28 15:10:36.000000000 -0500 @@ -65,12 +65,12 @@ DIST_SOURCES = $(libbrcm_apps_dhcpc_a_SO ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run aclocal-1.10 -AMTAR = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run tar +ACLOCAL = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run aclocal-1.10 +AMTAR = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run tar AR = ar -AUTOCONF = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run autoconf -AUTOHEADER = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run autoheader -AUTOMAKE = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run automake-1.10 +AUTOCONF = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run autoconf +AUTOHEADER = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run autoheader +AUTOMAKE = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run automake-1.10 AWK = gawk BASH = /bin/sh CC = gcc @@ -107,7 +107,7 @@ LIBTOOL = $(SHELL) $(top_builddir)/libto LIPO = LN_S = ln -s LTLIBOBJS = -MAKEINFO = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run makeinfo +MAKEINFO = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run makeinfo MKDIR_P = /bin/mkdir -p NM = /usr/bin/nm -B NMEDIT = @@ -118,9 +118,9 @@ OTOOL64 = PACKAGE = PACKAGE_BUGREPORT = benli@broadcom.com PACKAGE_NAME = brcm_iscsi -PACKAGE_STRING = brcm_iscsi 0.3.0 +PACKAGE_STRING = brcm_iscsi 0.4.3 PACKAGE_TARNAME = brcm_iscsi -PACKAGE_VERSION = 0.3.0 +PACKAGE_VERSION = 0.4.3 PATH_SEPARATOR = : RANLIB = ranlib SED = /bin/sed @@ -130,10 +130,10 @@ STRIP = strip VERSION = YACC = bison -y YFLAGS = -abs_builddir = /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/src/apps/dhcpc -abs_srcdir = /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/src/apps/dhcpc -abs_top_builddir = /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio -abs_top_srcdir = /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio +abs_builddir = /tmp/brcm_iscsi_uio-0.4.3/src/apps/dhcpc +abs_srcdir = /tmp/brcm_iscsi_uio-0.4.3/src/apps/dhcpc +abs_top_builddir = /tmp/brcm_iscsi_uio-0.4.3 +abs_top_srcdir = /tmp/brcm_iscsi_uio-0.4.3 ac_ct_CC = gcc ac_ct_DUMPBIN = am__include = include @@ -161,7 +161,7 @@ host_vendor = unknown htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = $(SHELL) /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/install-sh +install_sh = $(SHELL) /tmp/brcm_iscsi_uio-0.4.3/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/Makefile open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/Makefile --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/Makefile 2009-06-18 16:06:57.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/Makefile 2009-07-28 15:10:36.000000000 -0500 @@ -55,12 +55,12 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run aclocal-1.10 -AMTAR = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run tar +ACLOCAL = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run aclocal-1.10 +AMTAR = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run tar AR = ar -AUTOCONF = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run autoconf -AUTOHEADER = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run autoheader -AUTOMAKE = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run automake-1.10 +AUTOCONF = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run autoconf +AUTOHEADER = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run autoheader +AUTOMAKE = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run automake-1.10 AWK = gawk BASH = /bin/sh CC = gcc @@ -97,7 +97,7 @@ LIBTOOL = $(SHELL) $(top_builddir)/libto LIPO = LN_S = ln -s LTLIBOBJS = -MAKEINFO = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run makeinfo +MAKEINFO = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run makeinfo MKDIR_P = /bin/mkdir -p NM = /usr/bin/nm -B NMEDIT = @@ -108,9 +108,9 @@ OTOOL64 = PACKAGE = PACKAGE_BUGREPORT = benli@broadcom.com PACKAGE_NAME = brcm_iscsi -PACKAGE_STRING = brcm_iscsi 0.3.0 +PACKAGE_STRING = brcm_iscsi 0.4.3 PACKAGE_TARNAME = brcm_iscsi -PACKAGE_VERSION = 0.3.0 +PACKAGE_VERSION = 0.4.3 PATH_SEPARATOR = : RANLIB = ranlib SED = /bin/sed @@ -120,10 +120,10 @@ STRIP = strip VERSION = YACC = bison -y YFLAGS = -abs_builddir = /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/src -abs_srcdir = /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/src -abs_top_builddir = /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio -abs_top_srcdir = /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio +abs_builddir = /tmp/brcm_iscsi_uio-0.4.3/src +abs_srcdir = /tmp/brcm_iscsi_uio-0.4.3/src +abs_top_builddir = /tmp/brcm_iscsi_uio-0.4.3 +abs_top_srcdir = /tmp/brcm_iscsi_uio-0.4.3 ac_ct_CC = gcc ac_ct_DUMPBIN = am__include = include @@ -151,7 +151,7 @@ host_vendor = unknown htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = $(SHELL) /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/install-sh +install_sh = $(SHELL) /tmp/brcm_iscsi_uio-0.4.3/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/uip/Makefile open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/uip/Makefile --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/uip/Makefile 2009-06-18 16:06:57.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/uip/Makefile 2009-07-28 15:10:36.000000000 -0500 @@ -70,12 +70,12 @@ DIST_SOURCES = $(libbrcm_iscsi_uip_a_SOU ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run aclocal-1.10 -AMTAR = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run tar +ACLOCAL = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run aclocal-1.10 +AMTAR = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run tar AR = ar -AUTOCONF = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run autoconf -AUTOHEADER = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run autoheader -AUTOMAKE = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run automake-1.10 +AUTOCONF = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run autoconf +AUTOHEADER = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run autoheader +AUTOMAKE = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run automake-1.10 AWK = gawk BASH = /bin/sh CC = gcc @@ -112,7 +112,7 @@ LIBTOOL = $(SHELL) $(top_builddir)/libto LIPO = LN_S = ln -s LTLIBOBJS = -MAKEINFO = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run makeinfo +MAKEINFO = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run makeinfo MKDIR_P = /bin/mkdir -p NM = /usr/bin/nm -B NMEDIT = @@ -123,9 +123,9 @@ OTOOL64 = PACKAGE = PACKAGE_BUGREPORT = benli@broadcom.com PACKAGE_NAME = brcm_iscsi -PACKAGE_STRING = brcm_iscsi 0.3.0 +PACKAGE_STRING = brcm_iscsi 0.4.3 PACKAGE_TARNAME = brcm_iscsi -PACKAGE_VERSION = 0.3.0 +PACKAGE_VERSION = 0.4.3 PATH_SEPARATOR = : RANLIB = ranlib SED = /bin/sed @@ -135,10 +135,10 @@ STRIP = strip VERSION = YACC = bison -y YFLAGS = -abs_builddir = /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/src/uip -abs_srcdir = /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/src/uip -abs_top_builddir = /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio -abs_top_srcdir = /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio +abs_builddir = /tmp/brcm_iscsi_uio-0.4.3/src/uip +abs_srcdir = /tmp/brcm_iscsi_uio-0.4.3/src/uip +abs_top_builddir = /tmp/brcm_iscsi_uio-0.4.3 +abs_top_srcdir = /tmp/brcm_iscsi_uio-0.4.3 ac_ct_CC = gcc ac_ct_DUMPBIN = am__include = include @@ -166,7 +166,7 @@ host_vendor = unknown htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = $(SHELL) /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/install-sh +install_sh = $(SHELL) /tmp/brcm_iscsi_uio-0.4.3/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/unix/build_date.c open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/unix/build_date.c --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/unix/build_date.c 2009-06-18 16:06:57.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/unix/build_date.c 2009-07-28 15:10:36.000000000 -0500 @@ -1 +1 @@ -char *build_date ="Thu Jun 18 14:06:57 PDT 2009"; +char *build_date ="Tue Jul 28 20:31:02 PDT 2009"; diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/unix/iscsid_ipc.c open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/unix/iscsid_ipc.c --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/unix/iscsid_ipc.c 2009-06-18 16:07:27.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/unix/iscsid_ipc.c 2009-07-28 15:10:36.000000000 -0500 @@ -84,6 +84,7 @@ static void * parse_iface_thread(void * data->u.iface_rec.rec.netdev); goto done; } + nic->flags |= NIC_CONFIG_NAME_MALLOC; nic->log_name = nic->config_device_name; prepare_nic(nic); diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/unix/libs/cnic.c open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/unix/libs/cnic.c --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/unix/libs/cnic.c 2009-06-22 09:38:39.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/unix/libs/cnic.c 2009-07-28 15:10:36.000000000 -0500 @@ -673,7 +673,7 @@ static int cnic_open(nic_t *nic) munmap(cnic->status_blk.msi, cnic->status_blk_size); error_sblk: - munmap(cnic->reg, 0x12000); + munmap(cnic->reg, 0x12800); error_regs: free(cnic->rx_pkt_ring); @@ -691,33 +691,26 @@ static int cnic_open(nic_t *nic) /** * cnic_uio_close_resources() - Used to free resource for the NIC/CNIC * @param nic - NIC device to free resource + * @param graceful - whether to wait to close gracefully * @return 0 on success, <0 on failure */ -static int cnic_uio_close_resources(nic_t *nic) +static int cnic_uio_close_resources(nic_t *nic, NIC_SHUTDOWN_T graceful) { cnic_t *cnic = (cnic_t *) nic->priv; int rc = 0; /* Remove the multicast addresses if added */ - if(nic->flags & NIC_ADDED_MULICAST) + if((nic->flags & NIC_ADDED_MULICAST) && + (graceful == ALLOW_GRACEFUL_SHUTDOWN)) disable_multicast(nic); - if (nic->fd > 0) { - rc = close(nic->fd); - if (rc != 0) { - LOG_WARN(PFX "%s: Couldn't close uio file descriptor: %d", - nic->log_name, nic->fd); - } else { - LOG_DEBUG(PFX "%s: Closed uio file descriptor: %d", - nic->log_name, nic->fd); - } - - nic->fd = INVALID_FD; - } - /* Check if there is an assoicated CNIC device */ - if(cnic == NULL) - return 0; + if(cnic == NULL) { + LOG_WARN(PFX "%s: when closing resources there is " + "no assoicated cnic", + nic->log_name); + return -EIO; + } /* Clean up allocated memory */ if(cnic->rx_ring != NULL) { @@ -761,24 +754,41 @@ static int cnic_uio_close_resources(nic_ } if (cnic->reg != NULL) { - rc = munmap(cnic->reg, 0x12000); + rc = munmap(cnic->reg, 0x12800); if (rc != 0) LOG_WARN(PFX "%s: Couldn't unmap regs", nic->log_name); cnic->reg = NULL; } - LOG_DEBUG(PFX "%s: Closed all resources", nic->log_name); + if (nic->fd != INVALID_FD) { + rc = close(nic->fd); + if (rc != 0) { + LOG_WARN(PFX "%s: Couldn't close uio file descriptor: %d", + nic->log_name, nic->fd); + } else { + LOG_DEBUG(PFX "%s: Closed uio file descriptor: %d", + nic->log_name, nic->fd); + } - return rc; + nic->fd = INVALID_FD; + } else { + LOG_WARN(PFX "%s: Invalid uio file descriptor: %d", + nic->log_name, nic->fd); + } + + LOG_INFO(PFX "%s: Closed all resources", nic->log_name); + + return 0; } /** * cnic_close() - Used to close the NIC device * @param nic - NIC device to close + * @param graceful - whether to wait to close gracefully * @return 0 if successful, <0 if there is an error */ -static int cnic_close(nic_t *nic) +static int cnic_close(nic_t *nic, NIC_SHUTDOWN_T graceful) { /* Sanity Check: validate the parameters */ if(nic == NULL) { @@ -786,12 +796,15 @@ static int cnic_close(nic_t *nic) return -EINVAL; } - LOG_INFO("Closing NIC device: %s", nic->log_name); + LOG_INFO(PFX "Closing NIC device: %s", nic->log_name); - cnic_uio_close_resources(nic); + cnic_uio_close_resources(nic, graceful); /* Free any named strings we might be holding onto */ - free(nic->config_device_name); + if(nic->flags & NIC_CONFIG_NAME_MALLOC) { + free(nic->config_device_name); + nic->flags &= ~NIC_CONFIG_NAME_MALLOC; + } nic->config_device_name = NULL; if(nic->flags & NIC_UIO_NAME_MALLOC) { diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/unix/libs/Makefile open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/unix/libs/Makefile --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/unix/libs/Makefile 2009-06-18 16:06:57.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/unix/libs/Makefile 2009-07-28 15:10:36.000000000 -0500 @@ -77,12 +77,12 @@ DIST_SOURCES = $(libbrcm_iscsiuio_hw_cni ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run aclocal-1.10 -AMTAR = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run tar +ACLOCAL = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run aclocal-1.10 +AMTAR = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run tar AR = ar -AUTOCONF = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run autoconf -AUTOHEADER = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run autoheader -AUTOMAKE = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run automake-1.10 +AUTOCONF = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run autoconf +AUTOHEADER = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run autoheader +AUTOMAKE = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run automake-1.10 AWK = gawk BASH = /bin/sh CC = gcc @@ -119,7 +119,7 @@ LIBTOOL = $(SHELL) $(top_builddir)/libto LIPO = LN_S = ln -s LTLIBOBJS = -MAKEINFO = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run makeinfo +MAKEINFO = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run makeinfo MKDIR_P = /bin/mkdir -p NM = /usr/bin/nm -B NMEDIT = @@ -130,9 +130,9 @@ OTOOL64 = PACKAGE = PACKAGE_BUGREPORT = benli@broadcom.com PACKAGE_NAME = brcm_iscsi -PACKAGE_STRING = brcm_iscsi 0.3.0 +PACKAGE_STRING = brcm_iscsi 0.4.3 PACKAGE_TARNAME = brcm_iscsi -PACKAGE_VERSION = 0.3.0 +PACKAGE_VERSION = 0.4.3 PATH_SEPARATOR = : RANLIB = ranlib SED = /bin/sed @@ -142,10 +142,10 @@ STRIP = strip VERSION = YACC = bison -y YFLAGS = -abs_builddir = /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/src/unix/libs -abs_srcdir = /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/src/unix/libs -abs_top_builddir = /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio -abs_top_srcdir = /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio +abs_builddir = /tmp/brcm_iscsi_uio-0.4.3/src/unix/libs +abs_srcdir = /tmp/brcm_iscsi_uio-0.4.3/src/unix/libs +abs_top_builddir = /tmp/brcm_iscsi_uio-0.4.3 +abs_top_srcdir = /tmp/brcm_iscsi_uio-0.4.3 ac_ct_CC = gcc ac_ct_DUMPBIN = am__include = include @@ -173,7 +173,7 @@ host_vendor = unknown htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = $(SHELL) /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/install-sh +install_sh = $(SHELL) /tmp/brcm_iscsi_uio-0.4.3/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/unix/logger.c open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/unix/logger.c --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/unix/logger.c 2009-06-18 01:57:40.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/unix/logger.c 2009-07-28 15:10:36.000000000 -0500 @@ -27,7 +27,7 @@ struct logger main_log = { .enabled = LOGGER_ENABLED, .fp = NULL, .log_file = (char *) default_logger_filename, - .level = LOG_LEVEL_DEBUG, + .level = LOG_LEVEL_INFO, .lock = PTHREAD_MUTEX_INITIALIZER, .stats = { @@ -134,7 +134,7 @@ int init_logger(char *filename) pthread_mutex_lock(&main_log.lock); - main_log.fp = fopen( filename, "w+"); + main_log.fp = fopen( filename, "a"); if( main_log.fp == NULL) { printf("Could not create log file: %s <%s>\n", filename, strerror(errno)); diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/unix/Makefile open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/unix/Makefile --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/unix/Makefile 2009-06-18 16:06:57.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/unix/Makefile 2009-07-28 15:10:36.000000000 -0500 @@ -33,7 +33,6 @@ POST_UNINSTALL = : build_triplet = x86_64-unknown-linux-gnu host_triplet = x86_64-unknown-linux-gnu bin_PROGRAMS = brcm_iscsiuio$(EXEEXT) -#am__append_1 = pcap_stubc. subdir = src/unix DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -46,21 +45,16 @@ CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) -am__brcm_iscsiuio_SOURCES_DIST = build_date.c main.c clock-arch.c \ - logger.c uevent.c pcap_stub.c nic.c nic_id.c nic_vlan.c \ - nic_nl.c nic_utils.c packet.c iscsid_ipc.c pcap_stubc. -am__objects_1 = am_brcm_iscsiuio_OBJECTS = brcm_iscsiuio-build_date.$(OBJEXT) \ brcm_iscsiuio-main.$(OBJEXT) \ brcm_iscsiuio-clock-arch.$(OBJEXT) \ brcm_iscsiuio-logger.$(OBJEXT) brcm_iscsiuio-uevent.$(OBJEXT) \ - brcm_iscsiuio-pcap_stub.$(OBJEXT) brcm_iscsiuio-nic.$(OBJEXT) \ - brcm_iscsiuio-nic_id.$(OBJEXT) \ + brcm_iscsiuio-nic.$(OBJEXT) brcm_iscsiuio-nic_id.$(OBJEXT) \ brcm_iscsiuio-nic_vlan.$(OBJEXT) \ brcm_iscsiuio-nic_nl.$(OBJEXT) \ brcm_iscsiuio-nic_utils.$(OBJEXT) \ brcm_iscsiuio-packet.$(OBJEXT) \ - brcm_iscsiuio-iscsid_ipc.$(OBJEXT) $(am__objects_1) + brcm_iscsiuio-iscsid_ipc.$(OBJEXT) brcm_iscsiuio_OBJECTS = $(am_brcm_iscsiuio_OBJECTS) brcm_iscsiuio_DEPENDENCIES = \ ${top_srcdir}/src/uip/libbrcm_iscsi_uip.a \ @@ -83,7 +77,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(brcm_iscsiuio_SOURCES) -DIST_SOURCES = $(am__brcm_iscsiuio_SOURCES_DIST) +DIST_SOURCES = $(brcm_iscsiuio_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-dvi-recursive install-exec-recursive \ @@ -97,12 +91,12 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run aclocal-1.10 -AMTAR = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run tar +ACLOCAL = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run aclocal-1.10 +AMTAR = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run tar AR = ar -AUTOCONF = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run autoconf -AUTOHEADER = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run autoheader -AUTOMAKE = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run automake-1.10 +AUTOCONF = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run autoconf +AUTOHEADER = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run autoheader +AUTOMAKE = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run automake-1.10 AWK = gawk BASH = /bin/sh CC = gcc @@ -139,7 +133,7 @@ LIBTOOL = $(SHELL) $(top_builddir)/libto LIPO = LN_S = ln -s LTLIBOBJS = -MAKEINFO = ${SHELL} /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/missing --run makeinfo +MAKEINFO = ${SHELL} /tmp/brcm_iscsi_uio-0.4.3/missing --run makeinfo MKDIR_P = /bin/mkdir -p NM = /usr/bin/nm -B NMEDIT = @@ -150,9 +144,9 @@ OTOOL64 = PACKAGE = PACKAGE_BUGREPORT = benli@broadcom.com PACKAGE_NAME = brcm_iscsi -PACKAGE_STRING = brcm_iscsi 0.3.0 +PACKAGE_STRING = brcm_iscsi 0.4.3 PACKAGE_TARNAME = brcm_iscsi -PACKAGE_VERSION = 0.3.0 +PACKAGE_VERSION = 0.4.3 PATH_SEPARATOR = : RANLIB = ranlib SED = /bin/sed @@ -162,10 +156,10 @@ STRIP = strip VERSION = YACC = bison -y YFLAGS = -abs_builddir = /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/src/unix -abs_srcdir = /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/src/unix -abs_top_builddir = /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio -abs_top_srcdir = /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio +abs_builddir = /tmp/brcm_iscsi_uio-0.4.3/src/unix +abs_srcdir = /tmp/brcm_iscsi_uio-0.4.3/src/unix +abs_top_builddir = /tmp/brcm_iscsi_uio-0.4.3 +abs_top_srcdir = /tmp/brcm_iscsi_uio-0.4.3 ac_ct_CC = gcc ac_ct_DUMPBIN = am__include = include @@ -193,7 +187,7 @@ host_vendor = unknown htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = $(SHELL) /home/benli/workspace/benli-eval-depot/benli/brcm_iscsi_uio/install-sh +install_sh = $(SHELL) /tmp/brcm_iscsi_uio-0.4.3/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale @@ -216,13 +210,24 @@ top_builddir = ../.. top_srcdir = ../.. SUBDIRS = libs INCLUDES = -I${top_srcdir}/src/uip \ + -I${top_srcdir}/src/apps/brcm-iscsi \ -I${top_srcdir}/src/apps/dhcpc \ -I${top_srcdir}/include \ -I${top_srcdir}/src/unix/libs/ -brcm_iscsiuio_SOURCES = build_date.c main.c clock-arch.c logger.c \ - uevent.c pcap_stub.c nic.c nic_id.c nic_vlan.c nic_nl.c \ - nic_utils.c packet.c iscsid_ipc.c $(am__append_1) +brcm_iscsiuio_SOURCES = build_date.c \ + main.c \ + clock-arch.c \ + logger.c \ + uevent.c \ + nic.c \ + nic_id.c \ + nic_vlan.c \ + nic_nl.c \ + nic_utils.c \ + packet.c \ + iscsid_ipc.c + brcm_iscsiuio_CFLAGS = $(AM_CFLAGS) \ $(LIBNL_CFLAGS) \ -DBYTE_ORDER=LITTLE @@ -321,7 +326,6 @@ include ./$(DEPDIR)/brcm_iscsiuio-nic_nl include ./$(DEPDIR)/brcm_iscsiuio-nic_utils.Po include ./$(DEPDIR)/brcm_iscsiuio-nic_vlan.Po include ./$(DEPDIR)/brcm_iscsiuio-packet.Po -include ./$(DEPDIR)/brcm_iscsiuio-pcap_stub.Po include ./$(DEPDIR)/brcm_iscsiuio-uevent.Po .c.o: @@ -415,20 +419,6 @@ brcm_iscsiuio-uevent.obj: uevent.c # DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ # $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(brcm_iscsiuio_CFLAGS) $(CFLAGS) -c -o brcm_iscsiuio-uevent.obj `if test -f 'uevent.c'; then $(CYGPATH_W) 'uevent.c'; else $(CYGPATH_W) '$(srcdir)/uevent.c'; fi` -brcm_iscsiuio-pcap_stub.o: pcap_stub.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(brcm_iscsiuio_CFLAGS) $(CFLAGS) -MT brcm_iscsiuio-pcap_stub.o -MD -MP -MF $(DEPDIR)/brcm_iscsiuio-pcap_stub.Tpo -c -o brcm_iscsiuio-pcap_stub.o `test -f 'pcap_stub.c' || echo '$(srcdir)/'`pcap_stub.c - mv -f $(DEPDIR)/brcm_iscsiuio-pcap_stub.Tpo $(DEPDIR)/brcm_iscsiuio-pcap_stub.Po -# source='pcap_stub.c' object='brcm_iscsiuio-pcap_stub.o' libtool=no \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(brcm_iscsiuio_CFLAGS) $(CFLAGS) -c -o brcm_iscsiuio-pcap_stub.o `test -f 'pcap_stub.c' || echo '$(srcdir)/'`pcap_stub.c - -brcm_iscsiuio-pcap_stub.obj: pcap_stub.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(brcm_iscsiuio_CFLAGS) $(CFLAGS) -MT brcm_iscsiuio-pcap_stub.obj -MD -MP -MF $(DEPDIR)/brcm_iscsiuio-pcap_stub.Tpo -c -o brcm_iscsiuio-pcap_stub.obj `if test -f 'pcap_stub.c'; then $(CYGPATH_W) 'pcap_stub.c'; else $(CYGPATH_W) '$(srcdir)/pcap_stub.c'; fi` - mv -f $(DEPDIR)/brcm_iscsiuio-pcap_stub.Tpo $(DEPDIR)/brcm_iscsiuio-pcap_stub.Po -# source='pcap_stub.c' object='brcm_iscsiuio-pcap_stub.obj' libtool=no \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(brcm_iscsiuio_CFLAGS) $(CFLAGS) -c -o brcm_iscsiuio-pcap_stub.obj `if test -f 'pcap_stub.c'; then $(CYGPATH_W) 'pcap_stub.c'; else $(CYGPATH_W) '$(srcdir)/pcap_stub.c'; fi` - brcm_iscsiuio-nic.o: nic.c $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(brcm_iscsiuio_CFLAGS) $(CFLAGS) -MT brcm_iscsiuio-nic.o -MD -MP -MF $(DEPDIR)/brcm_iscsiuio-nic.Tpo -c -o brcm_iscsiuio-nic.o `test -f 'nic.c' || echo '$(srcdir)/'`nic.c mv -f $(DEPDIR)/brcm_iscsiuio-nic.Tpo $(DEPDIR)/brcm_iscsiuio-nic.Po diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/unix/nic.c open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/unix/nic.c --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/unix/nic.c 2009-06-18 17:16:49.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/unix/nic.c 2009-07-28 15:10:36.000000000 -0500 @@ -396,24 +396,38 @@ nic_t *nic_init() return nic; } -void nic_close(nic_t *nic) +/** + * nic_close() - Used to indicate to a NIC that it should close + * @param nic - the nic to close + * @param graceful - ALLOW_GRACEFUL_SHUTDOWN will check the nic state + * before proceeding to close() + * FORCE_SHUTDOWN will force the nic to close() + * reguardless of the state + */ +void nic_close(nic_t *nic, NIC_SHUTDOWN_T graceful) { int rc; - if(nic->state & NIC_DISABLED) + if((nic->flags & NIC_DISABLED) && + (graceful == ALLOW_GRACEFUL_SHUTDOWN)) return; /* The NIC could be configured by the uIP config file * but not assoicated with a hardware library just yet * we will need to check for this */ - if(nic->ops == NULL) + if(nic->ops == NULL) { + LOG_WARN(PFX "%s: when closing nic->ops == NULL", + nic->log_name); return; + } - rc = (*nic->ops->close)(nic); + rc = (*nic->ops->close)(nic, graceful); if(rc != 0) { LOG_ERR(PFX "%s: Could not close nic", nic->log_name); } else { - nic->state |= NIC_DISABLED; + nic->state = NIC_STOPPED; + nic->flags &= ~NIC_ENABLED; + nic->flags |= NIC_DISABLED; } } @@ -489,6 +503,13 @@ int nic_process_intr(nic_t *nic) int count; struct timeval tv; + /* Simple sanity checks */ + if ((nic->state & NIC_RUNNING) != NIC_RUNNING) + return -EBUSY; + + if(nic->fd == INVALID_FD) + return -EIO; + FD_ZERO(&fdset); FD_SET(nic->fd, &fdset); @@ -846,7 +867,7 @@ static void nic_loop_close(void *arg) { nic_t *nic = (nic_t *) arg; - (*nic->ops->close)(nic); + (*nic->ops->close)(nic, 0); } void *nic_loop(void *arg) @@ -988,8 +1009,7 @@ void *nic_loop(void *arg) 1); rc = nic_process_intr(nic); - - while(rc > 0 && nic->state & NIC_RUNNING) { + while((rc > 0) && (nic->state & NIC_RUNNING)) { rc = process_packets(nic, &periodic_timer, &arp_timer, @@ -998,11 +1018,11 @@ void *nic_loop(void *arg) } nic->state = NIC_STOPPED; - nic_close(nic); + nic_close(nic, 1); /* Signal we are done closing CNIC/UIO device */ pthread_mutex_lock(&nic->disable_wait_mutex); - pthread_cond_signal(&nic->disable_wait_cond); + pthread_cond_broadcast(&nic->disable_wait_cond); pthread_mutex_unlock(&nic->disable_wait_mutex); } diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/unix/nic.h open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/unix/nic.h --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/unix/nic.h 2009-06-18 17:15:55.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/unix/nic.h 2009-07-28 15:10:36.000000000 -0500 @@ -126,7 +126,7 @@ typedef struct nic_ops { struct nic_lib_ops lib_ops; int (*open)(struct nic *); - int (*close)(struct nic *); + int (*close)(struct nic *, int); int (*read)(struct nic *, struct packet *); int (*write)(struct nic *, nic_interface_t *, struct packet *); @@ -160,6 +160,7 @@ typedef struct nic { #define NIC_TX_HAS_SENT 0x0400 #define NIC_UIO_NAME_MALLOC 0x1000 +#define NIC_CONFIG_NAME_MALLOC 0x2000 uint16_t state; #define NIC_STOPPED 0x0001 @@ -274,8 +275,14 @@ void put_packet_in_tx_queue(struct packe void put_packet_in_free_queue(struct packet *pkt, nic_t *nic); + +typedef enum { + ALLOW_GRACEFUL_SHUTDOWN = 1, + FORCE_SHUTDOWN = 2, +} NIC_SHUTDOWN_T; + int unload_all_nic_libraries(); -void nic_close(nic_t *nic); +void nic_close(nic_t *nic, NIC_SHUTDOWN_T graceful); /* Use this function to fill in minor number and uio, and eth names */ int nic_fill_name(nic_t *nic); diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/unix/nic_nl.c open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/unix/nic_nl.c --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/unix/nic_nl.c 2009-06-18 16:57:17.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/unix/nic_nl.c 2009-07-28 15:10:36.000000000 -0500 @@ -53,13 +53,9 @@ const static struct sockaddr_nl dest_add .nl_groups = 0, /* unicast */ }; -#define NLM_BUF_DEFAULT_MAX 8192 - #define POLL_NL 0 #define POLL_MAX 1 -#define ACTOR_RESOLUTION 250 /* in millis */ - /* Netlink */ int nl_sock = INVALID_FD; @@ -198,6 +194,7 @@ __kipc_call(int fd, void *iov_base, int struct iovec iov; struct iscsi_uevent *ev = iov_base; enum iscsi_uevent_e type = ev->type; + int wait_response; /* Sanity check */ if(iov_base == NULL) @@ -208,11 +205,15 @@ __kipc_call(int fd, void *iov_base, int rc = kwritev(fd, type, &iov, 1); + wait_response = 0; do { - if ((rc = nlpayload_read(fd, (void*)ev, - sizeof(*ev), MSG_PEEK)) < 0) { + rc = nlpayload_read(fd, (void*)ev, sizeof(*ev), MSG_PEEK); + if (rc < 0) { + LOG_ERR(PFX "Error reading resp to reply: %s[%d]", + strerror(rc), rc); return rc; } + if (ev->type != type) { LOG_DEBUG(PFX "expecting event %d, got %d, handling...", type, ev->type); @@ -246,7 +247,11 @@ __kipc_call(int fd, void *iov_base, int } break; } - } while ((ev->type != type) && (event_loop_stop == 0)); + + wait_response++; + } while ((ev->type != type) && + (event_loop_stop == 0) && + (wait_response < MAX_COUNT_NIC_NL_RESP)); return rc; } @@ -295,10 +300,13 @@ static int ctldev_handle() if((ev_size - sizeof(ev)) != sizeof(*path)) LOG_WARN("Didn't get iscsi_path size(%d) expected %d", ev_size - sizeof(ev), sizeof(*path)); + host_no = ev->r.req_path.host_no; break; case ISCSI_KEVENT_IF_DOWN: msg_type_str = "if_down"; + + host_no = ev->r.notify_if_down.host_no; break; default: /* We don't care about other iSCSI Netlink messages */ @@ -307,10 +315,8 @@ static int ctldev_handle() goto error; } - host_no = ev->r.req_path.host_no; /* This is a message that drivers should be interested in */ - LOG_INFO("Received: '%s': host_no: %d", - msg_type_str, host_no); + LOG_INFO("Received: '%s': host_no: %d", msg_type_str, host_no); rc = from_host_no_find_associated_eth_device(host_no, &nic); if(rc != 0) { @@ -330,13 +336,24 @@ static int ctldev_handle() payload = (uint8_t *) ((uint8_t *)ev) + sizeof(*ev); path = (struct iscsi_path *)payload; - if(nic->ops) { - /* pass the request up to the user space library driver */ - if(nic->ops->handle_iscsi_path_req) { - nic->ops->handle_iscsi_path_req(nic, - nl_sock, ev, - path, ev_size); + switch (ev->type) { + case ISCSI_KEVENT_PATH_REQ: + /* pass the request up to the user space + * library driver */ + if(nic->ops->handle_iscsi_path_req) { + nic->ops->handle_iscsi_path_req(nic, + nl_sock, ev, + path, ev_size); + } + break; + case ISCSI_KEVENT_IF_DOWN: + + /* If the interface can't be brought down nicely + * we will try to drop the hammer */ + if (nic_disable(nic) == -EALREADY) + nic_close(nic, 0); + break; } } @@ -358,24 +375,27 @@ int nic_nl_open() { int rc; struct pollfd poll_array[POLL_MAX]; + memset(poll_array, 0, sizeof(poll_array)); nlm_sendbuf = calloc(1, NLM_BUF_DEFAULT_MAX); if (!nlm_sendbuf) { - LOG_ERR(PFX "can not allocate nlm_sendbuf"); - return -ENOMEM; + LOG_ERR(PFX "can't allocate nlm_sendbuf"); + rc = -ENOMEM; + goto error; } nlm_recvbuf = calloc(1, NLM_BUF_DEFAULT_MAX); if (!nlm_recvbuf) { - LOG_ERR("can not allocate nlm_recvbuf"); - return -ENOMEM; + LOG_ERR(PFX "can't allocate nlm_recvbuf"); + rc = -ENOMEM; + goto error; } nl_sock = socket(PF_NETLINK, SOCK_RAW, NETLINK_ISCSI); if (nl_sock < 0) { LOG_ERR(PFX "can not create NETLINK_ISCSI socket"); - free(nlm_sendbuf); - return -ENOMEM; + rc = -ENOMEM; + goto error; } memset(&src_addr, 0, sizeof(src_addr)); @@ -399,8 +419,10 @@ int nic_nl_open() sleep(1); } - if(event_loop_stop) - return -EINVAL; + if(event_loop_stop) { + rc = -EINVAL; + goto error; + } LOG_INFO(PFX "Netlink to CNIC on pid %d is ready", src_addr.nl_pid); @@ -408,7 +430,7 @@ int nic_nl_open() poll_array[POLL_NL].events = POLLIN; while (!event_loop_stop) { - int res = poll(poll_array, POLL_MAX, ACTOR_RESOLUTION); + int res = poll(poll_array, POLL_MAX, NL_POLL_RESOLUTION); if (res > 0) { if (poll_array[POLL_NL].revents) ctldev_handle(); @@ -424,6 +446,18 @@ int nic_nl_open() } LOG_INFO(PFX "Netlink thread exit'ing"); + rc = 0; + +error: + if(nlm_sendbuf) { + free(nlm_sendbuf); + nlm_sendbuf = NULL; + } + + if(nlm_recvbuf) { + free(nlm_recvbuf); + nlm_recvbuf = NULL; + } return 0; } diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/unix/nic_utils.c open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/unix/nic_utils.c --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/unix/nic_utils.c 2009-06-18 17:18:28.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/unix/nic_utils.c 2009-07-28 15:10:36.000000000 -0500 @@ -95,7 +95,7 @@ int nic_discover_iscsi_hosts() LOG_INFO(PFX "Found host[%d]: %s", host_no, files[i]->d_name); - /* Build the path to determine uio name */ + /* Build the path to determine netdev name */ snprintf(temp_path, sizeof(temp_path), iscsi_host_path_netdev_template, host_no); @@ -103,23 +103,28 @@ int nic_discover_iscsi_hosts() if(rc != 0) continue; - /* sanitize name string by replacing newline with - * null termination */ - raw_tmp = raw; - while(*raw_tmp != '\n') - raw_tmp++; - *raw_tmp = '\0'; - rc = from_host_no_find_associated_eth_device(host_no, &nic); if(rc != 0) { LOG_INFO(PFX "NIC not found creating an instance for host_no: %d", host_no); + nic = nic_init(); + if(nic == NULL) { + LOG_ERR(PFX "%s: Couldn't allocate space for %s", + raw); + + return -ENOMEM; + } + + strncpy(nic->eth_device_name, raw, raw_size); + nic->config_device_name = nic->eth_device_name; + nic->log_name = nic->eth_device_name; } else { LOG_INFO(PFX "%s: NIC found host_no: %d", nic->log_name, host_no); } + free(raw); } @@ -435,6 +440,9 @@ int from_phys_name_find_assoicated_uio_d int rc; char *interface_name = nic->config_device_name; + if(interface_name == NULL) + interface_name = nic->eth_device_name; + count = scandir(base_uio_sysfs_name, &files, filter_uio_name, alphasort); @@ -585,8 +593,9 @@ int nic_fill_name(nic_t *nic) { int rc; - if(memcmp(uio_base_dir, nic->config_device_name, - sizeof(uio_base_dir) - 1) == 0) { + if((nic->config_device_name != NULL) && + (memcmp(uio_base_dir, nic->config_device_name, + sizeof(uio_base_dir) - 1) == 0)) { uint16_t uio_minor; char eth_name[sizeof(nic->eth_device_name)]; @@ -791,7 +800,7 @@ void nic_close_all() /* Start the shutdown process */ nic = nic_list; while (nic != NULL) { - nic_close(nic); + nic_close(nic, 1); nic = nic->next; } pthread_mutex_unlock(&nic_list_mutex); diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/unix/options.h open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/unix/options.h --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/unix/options.h 2009-06-18 01:04:53.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/unix/options.h 2009-07-28 15:10:36.000000000 -0500 @@ -1,4 +1,4 @@ -/* cnic_uio.c: CNIC UIO uIP user space stack +/* options.c: CNIC UIO uIP user space stack * * Copyright (c) 2004-2008 Broadcom Corporation * @@ -15,6 +15,40 @@ #include <time.h> #include <sys/types.h> +/****************************************************************************** + * Constants which are tuned at compile time by the user + *****************************************************************************/ + +/** + * MAX_COUNT_NIC_NL_RESP - This is the maximum number of polls uIP will + * try for a kernel response after a PATH_REQ + */ +#define MAX_COUNT_NIC_NL_RESP 5 + +/** + * ENABLE_LOG_UEVENT - By defining ENABLE_LOG_UEVENT this will log all the + * uevents from the kernel that the uIP application + * sees. This is useful for debugging purposes + */ +#undef ENABLE_LOG_UEVENT + +/** + * NLM_BUF_DEFAULT_MAX - This is the buffer size allocated for the send/receive + * buffers used by the uIP Netlink subsystem. This + * value is in bytes. + */ +#define NLM_BUF_DEFAULT_MAX 8192 /* bytes */ + +/** + * NL_POLL_RESOLUTION - This defines the number of milliseconds between + * each polling of the Netlink socket. + */ +#define NL_POLL_RESOLUTION 250 /* milliseconds */ + +/****************************************************************************** + * Non adjustable constants + *****************************************************************************/ + #define APP_NAME "uIP" /* BUILD_DATE is automatically generated from the Makefile */ @@ -30,9 +64,6 @@ struct options { /* Time the userspace daemon was started */ time_t start_time; - -// int8_t mac[6]; -// int8_t padding[2]; }; extern int event_loop_stop; diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/unix/uevent.c open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/unix/uevent.c --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/unix/uevent.c 2009-06-18 16:04:34.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/unix/uevent.c 2009-07-28 15:10:36.000000000 -0500 @@ -97,7 +97,6 @@ static void parse_uevent(char *buf, int bufpos = 0; event->init = buf; -// bufpos += 1; for (i = 0; (bufpos < buf_len); i++) { char *key = &buf[bufpos]; @@ -106,37 +105,37 @@ static void parse_uevent(char *buf, int uevent_action_key, sizeof(uevent_action_key) - 1) == 0) { event->action = &key[sizeof(uevent_action_key) - 1]; - LOG_DEBUG("%s%s", uevent_action_key, event->action); + LOG_UEVENT("%s%s", uevent_action_key, event->action); } else if (memcmp(key, uevent_devpath_key, sizeof(uevent_devpath_key) - 1) == 0) { event->devpath = &key[sizeof(uevent_devpath_key) - 1]; - LOG_DEBUG("%s%s", uevent_devpath_key, event->devpath); + LOG_UEVENT("%s%s", uevent_devpath_key, event->devpath); } else if (memcmp(key, uevent_subsystem_key, sizeof(uevent_subsystem_key) - 1) == 0) { event->subsystem = &key[sizeof(uevent_subsystem_key) - 1]; - LOG_DEBUG("%s%s", uevent_subsystem_key, - event->subsystem); + LOG_UEVENT("%s%s", uevent_subsystem_key, + event->subsystem); } else if (memcmp (key, uevent_driver_key, sizeof(uevent_driver_key) - 1) == 0) { event->driver = &key[sizeof(uevent_driver_key) - 1]; - LOG_DEBUG("%s%s", uevent_driver_key, event->driver); + LOG_UEVENT("%s%s", uevent_driver_key, event->driver); } else if (memcmp(key, uevent_seqnum_key, sizeof(uevent_seqnum_key) - 1) == 0) { event->seqnum = &key[sizeof(uevent_seqnum_key) - 1]; - LOG_DEBUG("%s%s", uevent_seqnum_key, event->seqnum); + LOG_UEVENT("%s%s", uevent_seqnum_key, event->seqnum); } else if (memcmp(key, uevent_devpath_old_key, sizeof(uevent_devpath_old_key) - 1) == 0) { event->devpath_old = &key[sizeof(uevent_devpath_old_key)] - 1; - LOG_DEBUG("%s%s", uevent_devpath_old_key, + LOG_UEVENT("%s%s", uevent_devpath_old_key, event->devpath_old); } else if (memcmp @@ -144,7 +143,7 @@ static void parse_uevent(char *buf, int sizeof(uevent_physdevpath_key) - 1) == 0) { event->physdevpath = &key[sizeof(uevent_physdevpath_key) - 1]; - LOG_DEBUG("%s%s", uevent_physdevpath_key, + LOG_UEVENT("%s%s", uevent_physdevpath_key, event->physdevpath); } else if (memcmp @@ -152,7 +151,7 @@ static void parse_uevent(char *buf, int sizeof(uevent_physdevbus_key) - 1) == 0) { event->physdevbus = &key[sizeof(uevent_physdevbus_key) - 1]; - LOG_DEBUG("%s%s", uevent_physdevbus_key, + LOG_UEVENT("%s%s", uevent_physdevbus_key, event->physdevbus); } else if (memcmp @@ -160,35 +159,35 @@ static void parse_uevent(char *buf, int sizeof(uevent_physdevdriver_key) - 1) == 0) { event->physdevdriver = &key[sizeof(uevent_physdevdriver_key) - 1]; - LOG_DEBUG("%s%s", uevent_physdevdriver_key, + LOG_UEVENT("%s%s", uevent_physdevdriver_key, event->physdevdriver); } else if (memcmp (key, uevent_major_key, sizeof(uevent_major_key) - 1) == 0) { event->major = &key[sizeof(uevent_major_key) - 1]; - LOG_DEBUG("%s%s", uevent_major_key, event->major); + LOG_UEVENT("%s%s", uevent_major_key, event->major); } else if (memcmp(key, uevent_minor_key, sizeof(uevent_minor_key) - 1) == 0) { event->minor = &key[sizeof(uevent_minor_key) - 1]; - LOG_DEBUG("%s%s", uevent_minor_key, event->minor); + LOG_UEVENT("%s%s", uevent_minor_key, event->minor); } else if (memcmp(key, uevent_timeout_key, sizeof(uevent_timeout_key) - 1) == 0) { event->timeout = &key[sizeof(uevent_timeout_key) - 1]; - LOG_DEBUG("%s%s", uevent_timeout_key, event->timeout); + LOG_UEVENT("%s%s", uevent_timeout_key, event->timeout); } else if (memcmp(key, uevent_interface_key, sizeof(uevent_interface_key) - 1) == 0) { event->interface = &key[sizeof(uevent_interface_key) - 1]; - LOG_DEBUG("%s%s", uevent_interface_key, + LOG_UEVENT("%s%s", uevent_interface_key, event->interface); } else if (memcmp(key, uevent_ifindex_key, sizeof(uevent_ifindex_key) - 1) == 0) { event->ifindex = &key[sizeof(uevent_ifindex_key) - 1]; - LOG_DEBUG("%s%s", uevent_ifindex_key, event->ifindex); + LOG_UEVENT("%s%s", uevent_ifindex_key, event->ifindex); } else { LOG_INFO(PFX "Unknown: %s", key); } @@ -239,6 +238,8 @@ static int wakeup_cnic_dev(struct parsed nic->log_name); } + nic->log_name = nic->eth_device_name; + /* Ensure all the NIC fields are initialized */ prepare_nic(nic); @@ -258,8 +259,11 @@ static int wakeup_cnic_dev(struct parsed pthread_mutex_unlock(&nic_list_mutex); if (nic == NULL) { + int uio_minor; + char eth_name[IFNAMSIZ]; + /* time to alloc a new cnic/uio device */ - LOG_INFO(PFX "Could not find dev instance"); + LOG_INFO(PFX "Couldn't find dev instance"); nic = nic_init(); if(nic == NULL) @@ -287,6 +291,16 @@ static int wakeup_cnic_dev(struct parsed uio_udev_path_template, minor); nic->flags |= NIC_UIO_NAME_MALLOC; + + rc = from_uio_find_associated_eth_device(uio_minor, + nic->eth_device_name, + sizeof(nic->eth_device_name)); + + nic->config_device_name = nic->eth_device_name; + nic->log_name = nic->eth_device_name; + + /* Ensure all the NIC fields are initialized */ + prepare_nic(nic); } rc = 0; @@ -310,7 +324,7 @@ static int close_cnic_dev(struct parsed_ rc = sscanf(event->minor, "%d", &minor); if(rc == 1) { - LOG_INFO(PFX "New uio device registered: minor: %d", minor); + LOG_INFO(PFX "Removing uio device: minor: %d", minor); } else { LOG_INFO(PFX "Couldn't parse minor number: %s", event->minor); return -EIO; @@ -336,6 +350,7 @@ static int close_cnic_dev(struct parsed_ if(nic == NULL) { + LOG_INFO(PFX "Couldn't find nic to close"); return -EINVAL; } diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/unix/uevent.h open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/unix/uevent.h --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/unix/uevent.h 2009-06-18 13:29:37.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/unix/uevent.h 2009-07-28 15:10:36.000000000 -0500 @@ -14,6 +14,12 @@ #include <pthread.h> +#ifdef ENABLE_LOG_UEVENT +#define LOG_UEVENT LOG_DEBUG +#else +#define LOG_UEVENT(fmt, args...) +#endif + extern pthread_mutex_t cnic_module_loaded_mutex; extern pthread_cond_t cnic_module_loaded_cond; extern int cnic_loaded; diff -aurp open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/unix/uip-conf.h open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/unix/uip-conf.h --- open-iscsi-2.0-871-test4.bnx2i/brcm_iscsi_uio/src/unix/uip-conf.h 2009-05-13 12:32:16.000000000 -0500 +++ open-iscsi-2.0-871-test4.bnx2i.work/brcm_iscsi_uio/src/unix/uip-conf.h 2009-07-28 15:10:36.000000000 -0500 @@ -153,17 +153,6 @@ typedef uint64_t uip_stats_t; #define UIP_CONF_IPV6 0 -/* Here we include the header file for the application(s) we use in - our project. */ -/*#include "smtp.h"*/ -/*#include "hello-world.h"*/ -//#include "brcm-iscsi.h" -/*#include "telnetd.h"*/ -/*#include "webserver.h"*/ -//#include "dhcpc.h" -/*#include "resolv.h"*/ -/*#include "webclient.h"*/ - #endif /* __UIP_CONF_H__ */ /** @} */