Fix issues found testing on earlier 2.6 systemsv1.0.1

6 files changed, 21 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index b75a0ad..1b717d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+20040525	Stephen Hemminger <shemminger@osdl.org>
+	* Released bridge-utils 1.0.1
+	  - Change configure option 
+	    from --with-linux=<path>
+	    to   --with-linux-headers=<path>
+	    so options match help message.
+	  - Fix so utilities work with earlier 2.6 kernels that
+	    have sysfs but not new ioctl's or directories yet.
+	  - Build spec file from template.
+	
 20040524	Stephen Hemminger <shemminger@osdl.org>
 	* Released bridge-utils 1.0
 	  - Use sysfs to control bridge parameters
diff --git a/bridge-utils.spec b/bridge-utils.spec.in
index 54aa1dc..32d0132 100644
--- a/bridge-utils.spec
+++ b/bridge-utils.spec.in
@@ -1,5 +1,5 @@
-Name: bridge-utils
-Version: 1.0
+Name: @PACKAGE@
+Version: @VERSION@
 Release: 1
 Copyright: GPL
 Group: System Environment/Base
diff --git a/configure.in b/configure.in
index 53c0eac..d630569 100644
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,9 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(brctl/brctl.c)
 AC_CONFIG_HEADER(libbridge/config.h)
-AM_INIT_AUTOMAKE(bridge-utils,1.0)
+AM_INIT_AUTOMAKE(bridge-utils,1.0.1)
 
-AC_ARG_WITH( linux, [  --with-linux-headers     Location of the linux headers to use], 
+AC_ARG_WITH( linux-headers, [  --with-linux-headers     Location of the linux headers to use], 
     KERNEL_HEADERS=$withval, KERNEL_HEADERS="/usr/src/linux/include")
 
 dnl Checks for programs.
@@ -28,4 +28,4 @@ AC_CHECK_LIB(sysfs, sysfs_open_directory)
 
 AC_SUBST(KERNEL_HEADERS)
 
-AC_OUTPUT(doc/Makefile libbridge/Makefile brctl/Makefile Makefile)
+AC_OUTPUT(doc/Makefile libbridge/Makefile brctl/Makefile Makefile bridge-utils.spec)
diff --git a/doc/Makefile b/doc/Makefile
index 8c57ff7..cc5ac85 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,6 +1,6 @@
 
 DESTDIR=
-KERNEL_HEADERS=-I/home/shemminger/bridge-2.6/include
+KERNEL_HEADERS=-I/home/shemminger/linux-2.6/include
 
 INSTALL=install -s
 
diff --git a/libbridge/libbridge_devif.c b/libbridge/libbridge_devif.c
index baf450b..665fbec 100644
--- a/libbridge/libbridge_devif.c
+++ b/libbridge/libbridge_devif.c
@@ -58,7 +58,7 @@ static struct sysfs_directory *bridge_sysfs_directory(const char *devname,
 	snprintf(path, SYSFS_PATH_MAX, "%s/%s", dev->path, subname);
 	sdir = sysfs_open_directory(path);
 	if (!sdir)
-		fprintf(stderr, "Can't open directory: %s\n", path);
+		dprintf("can't open directory: %s\n", path);
 	return sdir;
 }
 
@@ -277,7 +277,7 @@ int br_add_interface(const char *bridge, int ifindex)
 #ifdef SIOCBRADDIF
 	ifr.ifr_ifindex = ifindex;
 	err = ioctl(br_socket_fd, SIOCBRADDIF, &ifr);
-	if (err < 0 && errno == EOPNOTSUPP)
+	if (err < 0)
 #endif
 	{
 		unsigned long args[4] = { BRCTL_ADD_IF, ifindex, 0, 0 };
@@ -298,7 +298,7 @@ int br_del_interface(const char *bridge, int ifindex)
 #ifdef SIOCBRDELIF
 	ifr.ifr_ifindex = ifindex;
 	err = ioctl(br_socket_fd, SIOCBRDELIF, &ifr);
-	if (err < 0 && errno == EOPNOTSUPP)
+	if (err < 0)
 #endif		
 	{
 		unsigned long args[4] = { BRCTL_DEL_IF, ifindex, 0, 0 };
diff --git a/libbridge/libbridge_if.c b/libbridge/libbridge_if.c
index 9eff89b..5a31f0e 100644
--- a/libbridge/libbridge_if.c
+++ b/libbridge/libbridge_if.c
@@ -33,7 +33,7 @@ int br_add_bridge(const char *brname)
 
 #ifdef SIOCBRADDBR
 	ret = ioctl(br_socket_fd, SIOCBRADDBR, brname);
-	if (ret < 0 && errno == -EOPNOTSUPP) 
+	if (ret < 0)
 #endif
 	{
 		char _br[IFNAMSIZ];
@@ -53,7 +53,7 @@ int br_del_bridge(const char *brname)
 
 #ifdef SIOCBRDELBR	
 	ret = ioctl(br_socket_fd, SIOCBRDELBR, brname);
-	if (ret < 0 && errno == -EOPNOTSUPP)
+	if (ret < 0)
 #endif
 	{
 		char _br[IFNAMSIZ];