release: v1.3.95

WiMAX low level tools for user/kernel interface v0.0.

Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>

10 files changed, 68 insertions, 60 deletions

diff --git a/.gitignore b/.gitignore
index 50aa927..c82a398 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-autom4te.cache
-
-syntax: glob
+libtool
+Makefile
+TAGS
 *.a
 *.ko
 *.la
@@ -12,29 +12,28 @@ syntax: glob
 *.os
 *.rej
 *.so
+*cscope*
 *~
-.deps$
-.libs$
-Makefile
-TAGS
-libtool
-
-syntax: regexp
-.deps/*
-.libs/*
+.deps/
+.libs/
 
-^libwimax-.*\.pc$
-^lib/config\.h$
-^lib/stamp-h1$
-^config\.log$
-^config\.status$
-^doc/doxygen.conf$
-^bin/wimax-tools-version$
-^include/wimax-version\.h
-^src/gnltest$
-^src/wimax-rfkill$
-^src/wimax-reset$
-^src/test-rfkill$
-^src/test-dump-pipe$
-^doc/html$
-^doc/latex$
+/autom4te.cache/
+/bin/wimax-tools-version
+/bin/wimaxll-reset
+/bin/wimaxll-rfkill
+/bin/wimaxll-wait-for-state-change
+/config.log
+/config.status
+/doc/doxygen.conf
+/doc/html/
+/doc/latex/
+/include/wimax-version.h
+/include/wimaxll-version.h
+/lib/config.h
+/lib/stamp-h1
+/libwimax-0-uninstalled.pc
+/libwimax-0.pc
+/libwimaxll-0-uninstalled.pc
+/libwimaxll-0.pc
+/src/test-dump-pipe
+/src/test-rfkill
diff --git a/aclocal.m4 b/aclocal.m4
index a94c7e1..fb0285a 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1522,7 +1522,7 @@ darwin* | rhapsody*)
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
   m4_if([$1], [],[
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) 
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -6672,7 +6672,7 @@ AC_MSG_RESULT([$SED])
 ])
 
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-#
+# 
 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -6712,7 +6712,7 @@ if test -n "$PKG_CONFIG"; then
 		AC_MSG_RESULT([no])
 		PKG_CONFIG=""
 	fi
-
+		
 fi[]dnl
 ])# PKG_PROG_PKG_CONFIG
 
@@ -6793,7 +6793,7 @@ if test $pkg_failed = yes; then
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
 	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-        else
+        else 
 	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
         fi
 	# Put the nasty error message in config.log where it belongs
diff --git a/bin/Makefile.in b/bin/Makefile.in
index 28d613e..071e717 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -271,13 +271,13 @@ clean-binPROGRAMS:
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
 	done
-wimaxll-reset$(EXEEXT): $(wimaxll_reset_OBJECTS) $(wimaxll_reset_DEPENDENCIES)
+wimaxll-reset$(EXEEXT): $(wimaxll_reset_OBJECTS) $(wimaxll_reset_DEPENDENCIES) 
 	@rm -f wimaxll-reset$(EXEEXT)
 	$(LINK) $(wimaxll_reset_OBJECTS) $(wimaxll_reset_LDADD) $(LIBS)
-wimaxll-rfkill$(EXEEXT): $(wimaxll_rfkill_OBJECTS) $(wimaxll_rfkill_DEPENDENCIES)
+wimaxll-rfkill$(EXEEXT): $(wimaxll_rfkill_OBJECTS) $(wimaxll_rfkill_DEPENDENCIES) 
 	@rm -f wimaxll-rfkill$(EXEEXT)
 	$(LINK) $(wimaxll_rfkill_OBJECTS) $(wimaxll_rfkill_LDADD) $(LIBS)
-wimaxll-wait-for-state-change$(EXEEXT): $(wimaxll_wait_for_state_change_OBJECTS) $(wimaxll_wait_for_state_change_DEPENDENCIES)
+wimaxll-wait-for-state-change$(EXEEXT): $(wimaxll_wait_for_state_change_OBJECTS) $(wimaxll_wait_for_state_change_DEPENDENCIES) 
 	@rm -f wimaxll-wait-for-state-change$(EXEEXT)
 	$(LINK) $(wimaxll_wait_for_state_change_OBJECTS) $(wimaxll_wait_for_state_change_LDADD) $(LIBS)
 install-binSCRIPTS: $(bin_SCRIPTS)
diff --git a/configure b/configure
index ee060eb..ae53fca 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for WiMAX low level tools 1.3.92.
+# Generated by GNU Autoconf 2.61 for WiMAX low level tools 1.3.93.
 #
 # Report bugs to <linux-wimax@intel.com>.
 #
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='WiMAX low level tools'
 PACKAGE_TARNAME='wimax-tools'
-PACKAGE_VERSION='1.3.92'
-PACKAGE_STRING='WiMAX low level tools 1.3.92'
+PACKAGE_VERSION='1.3.93'
+PACKAGE_STRING='WiMAX low level tools 1.3.93'
 PACKAGE_BUGREPORT='linux-wimax@intel.com'
 
 ac_unique_file="lib/internal.h"
@@ -1407,7 +1407,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 WiMAX low level tools 1.3.92 to adapt to many kinds of systems.
+\`configure' configures WiMAX low level tools 1.3.93 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1477,7 +1477,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of WiMAX low level tools 1.3.92:";;
+     short | recursive ) echo "Configuration of WiMAX low level tools 1.3.93:";;
    esac
   cat <<\_ACEOF
 
@@ -1594,7 +1594,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-WiMAX low level tools configure 1.3.92
+WiMAX low level tools configure 1.3.93
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1608,7 +1608,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 WiMAX low level tools $as_me 1.3.92, which was
+It was created by WiMAX low level tools $as_me 1.3.93, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2299,7 +2299,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='wimax-tools'
- VERSION='1.3.92'
+ VERSION='1.3.93'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -20761,7 +20761,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 WiMAX low level tools $as_me 1.3.92, which was
+This file was extended by WiMAX low level tools $as_me 1.3.93, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20814,7 +20814,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-WiMAX low level tools config.status 1.3.92
+WiMAX low level tools config.status 1.3.93
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.in b/configure.in
index 69eae57..3bdc9e5 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_PREREQ(2.50)
-AC_INIT([WiMAX low level tools], [1.3.92],
+AC_INIT([WiMAX low level tools], [1.3.95],
         [linux-wimax@intel.com], [wimax-tools])
 AC_CONFIG_SRCDIR([lib/internal.h])
 AM_INIT_AUTOMAKE
@@ -104,7 +104,7 @@ wimax_gnl_version=[$(grep '^[[:space:]]*WIMAX_GNL_VERSION[[:space:]]*=[[:space:]
      | sed 's/^[[:space:]]*WIMAX_GNL_VERSION[[:space:]]*=[[:space:]]*\([0-9]\+\),$/\1/')]
 wimax_gnl_vmajor=$(($wimax_gnl_version / 10))
 wimax_gnl_vminor=$(($wimax_gnl_version % 10))
-need_vmajor=3
+need_vmajor=0
 need_vminor=0
 if test $wimax_gnl_vmajor != $need_vmajor
 then
diff --git a/lib/Makefile.in b/lib/Makefile.in
index e6328f0..37522bb 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -276,7 +276,7 @@ config.h: stamp-h1
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status lib/config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
 	cd $(top_srcdir) && $(AUTOHEADER)
 	rm -f stamp-h1
 	touch $@
@@ -312,7 +312,7 @@ uninstall-libLIBRARIES:
 
 clean-libLIBRARIES:
 	-test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
-libwimaxll.a: $(libwimaxll_a_OBJECTS) $(libwimaxll_a_DEPENDENCIES)
+libwimaxll.a: $(libwimaxll_a_OBJECTS) $(libwimaxll_a_DEPENDENCIES) 
 	-rm -f libwimaxll.a
 	$(libwimaxll_a_AR) libwimaxll.a $(libwimaxll_a_OBJECTS) $(libwimaxll_a_LIBADD)
 	$(RANLIB) libwimaxll.a
@@ -343,7 +343,7 @@ clean-libLTLIBRARIES:
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libwimaxll.la: $(libwimaxll_la_OBJECTS) $(libwimaxll_la_DEPENDENCIES)
+libwimaxll.la: $(libwimaxll_la_OBJECTS) $(libwimaxll_la_DEPENDENCIES) 
 	$(libwimaxll_la_LINK) -rpath $(libdir) $(libwimaxll_la_OBJECTS) $(libwimaxll_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
diff --git a/lib/internal.h b/lib/internal.h
index 57dbd32..b85619a 100644
--- a/lib/internal.h
+++ b/lib/internal.h
@@ -84,6 +84,7 @@ struct wimaxll_mc_group {
  *
  * FIXME: this needs some rewriting
  *
+ * \param ifidx Interface Index 
  * \param nlh_tx handle for writing to the kernel.
  *     Internal note: You \b have \b to set the handlers for
  *     %NL_CB_VALID and nl_cb_err() callbacks, as each callsite will
@@ -100,6 +101,7 @@ struct wimaxll_mc_group {
  *     driver implements.
  */
 struct wimaxll_handle {
+	unsigned ifidx;
 	struct nl_handle *nlh_tx;
 	int gnl_family_id;
 	unsigned mc_msg;
diff --git a/lib/op-open.c b/lib/op-open.c
index d151284..53fcec9 100644
--- a/lib/op-open.c
+++ b/lib/op-open.c
@@ -71,6 +71,7 @@
 #include <errno.h>
 #include <assert.h>
 #include <linux/types.h>
+#include <net/if.h>
 #include <netlink/msg.h>
 #include <netlink/netlink.h>
 #include <netlink/genl/genl.h>
@@ -473,12 +474,17 @@ struct wimaxll_handle *wimaxll_open(const char *device)
 	}
 
 	/* Lookup the generic netlink family */
-	snprintf(buf, sizeof(buf), "WiMAX %s", wmx->name);
+	wmx->ifidx = if_nametoindex(wmx->name);
+	if (wmx->ifidx == 0) {
+		wimaxll_msg(wmx, "E: device %s does not exist\n", wmx->name);
+		goto error_no_dev;
+	}
+	snprintf(buf, sizeof(buf), "WiMAX %u", wmx->ifidx);
 	result = genl_ctrl_resolve(wmx->nlh_tx, buf);
 	if (result < 0) {
 		wimaxll_msg(wmx, "E: device %s presents no WiMAX interface; "
 			  "it might not exist, not be be a WiMAX device or "
-			  "support an interface unknown to libwimax: %d\n",
+			  "support an interface unknown to libwimaxll: %d\n",
 			  wmx->name, result);
 		goto error_ctrl_resolve;
 	}
@@ -506,6 +512,7 @@ struct wimaxll_handle *wimaxll_open(const char *device)
 error_msg_open:
 error_cmd_open:
 error_ctrl_resolve:
+error_no_dev:
 	nl_close(wmx->nlh_tx);
 error_nl_connect_tx:
 	nl_handle_destroy(wmx->nlh_tx);
diff --git a/ltmain.sh b/ltmain.sh
index 49c5745..5def351 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -382,7 +382,7 @@ func_extract_archives ()
 	  darwin_curdir=`pwd`
 	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
 	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
-	  if test -n "$darwin_arches"; then
+	  if test -n "$darwin_arches"; then 
 	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
 	    darwin_arch=
 	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
@@ -580,7 +580,7 @@ if test -n "$prevopt"; then
 fi
 
 case $disable_libs in
-no)
+no) 
   ;;
 shared)
   build_libtool_libs=no
@@ -751,7 +751,7 @@ if test -z "$show_help"; then
       # Many Bourne shells cannot handle close brackets correctly
       # in scan sets, and some SunOS ksh mistreat backslash-escaping
       # in scan sets (worked around with variable expansion),
-      # and furthermore cannot handle '|' '&' '(' ')' in scan sets
+      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
       # at all, so we specify them separately.
       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 	lastarg="\"$lastarg\""
@@ -1531,7 +1531,7 @@ EOF
 
       -framework|-arch|-isysroot)
 	case " $CC " in
-	  *" ${arg} ${1} "* | *" ${arg}	${1} "*)
+	  *" ${arg} ${1} "* | *" ${arg}	${1} "*) 
 		prev=darwin_framework_skip ;;
 	  *) compiler_flags="$compiler_flags $arg"
 	     prev=darwin_framework ;;
@@ -4070,7 +4070,7 @@ EOF
 	    libobjs="$libobjs $func_extract_archives_result"
 	  fi
 	fi
-
+	
 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
 	  eval flag=\"$thread_safe_flag_spec\"
 	  linker_flags="$linker_flags $flag"
@@ -5861,7 +5861,7 @@ relink_command=\"$relink_command\""
 
       case $arg in
       -d) isdir=yes ;;
-      -f)
+      -f) 
       	case " $install_prog " in
 	*[\\\ /]cp\ *) ;;
 	*) prev=$arg ;;
@@ -6254,7 +6254,7 @@ relink_command=\"$relink_command\""
 	fi
 
 	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyway
+	# one anyway 
 	case $install_prog,$host in
 	*/usr/bin/install*,*cygwin*)
 	  case $file:$destfile in
diff --git a/src/Makefile.in b/src/Makefile.in
index 15c8365..a5de712 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -229,10 +229,10 @@ clean-noinstPROGRAMS:
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
 	done
-test-dump-pipe$(EXEEXT): $(test_dump_pipe_OBJECTS) $(test_dump_pipe_DEPENDENCIES)
+test-dump-pipe$(EXEEXT): $(test_dump_pipe_OBJECTS) $(test_dump_pipe_DEPENDENCIES) 
 	@rm -f test-dump-pipe$(EXEEXT)
 	$(LINK) $(test_dump_pipe_OBJECTS) $(test_dump_pipe_LDADD) $(LIBS)
-test-rfkill$(EXEEXT): $(test_rfkill_OBJECTS) $(test_rfkill_DEPENDENCIES)
+test-rfkill$(EXEEXT): $(test_rfkill_OBJECTS) $(test_rfkill_DEPENDENCIES) 
 	@rm -f test-rfkill$(EXEEXT)
 	$(LINK) $(test_rfkill_OBJECTS) $(test_rfkill_LDADD) $(LIBS)