Merge branch 'master' of github.com:greearb/xorp.ct

greearb · Oct 3, 2011 · 544f767 · 544f767
2 parents 20ce2c0 + d0b51ad
commit 544f767
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/xorp/fea/data_plane/ifconfig/ifconfig_vlan_get_linux.cc b/xorp/fea/data_plane/ifconfig/ifconfig_vlan_get_linux.cc
@@ -38,6 +38,9 @@
 #ifdef HAVE_NET_IF_VLAN_VAR_H
 #include <net/if_vlan_var.h>
 #endif
+#ifdef HAVE_NET_IF_VLANVAR_H
+#include <net/if_vlanvar.h>
+#endif
 
 #include "fea/ifconfig.hh"
 #include "ifconfig_vlan_get_linux.hh"

diff --git a/xorp/fea/data_plane/ifconfig/ifconfig_vlan_set_linux.cc b/xorp/fea/data_plane/ifconfig/ifconfig_vlan_set_linux.cc
@@ -43,6 +43,10 @@
 #ifdef HAVE_NET_IF_VLAN_VAR_H
 #include <net/if_vlan_var.h>
 #endif
+#ifdef HAVE_NET_IF_VLANVAR_H
+#include <net/if_vlanvar.h>
+#endif
+
 
 #include "fea/ifconfig.hh"
 #include "ifconfig_vlan_set_linux.hh"
@@ -256,7 +260,7 @@ IfConfigVlanSetLinux::add_vlan(const string& parent_ifname,
 	//
 	if (result < 0) {
 	    error_msg = c_format("Cannot create VLAN interface %s: %s errno: %i",
-				 vlan_name.c_str(), strerror(saved_errno), saved_errno);
+				 vlan_name.c_str(), strerror(errno), errno);
 	    return (XORP_ERROR);
 	}
 	// XXX: The created name didn't match
@@ -265,7 +269,7 @@ IfConfigVlanSetLinux::add_vlan(const string& parent_ifname,
 			     "the created name (%s) doesn't match",
 			     vlan_name.c_str(), ifreq.ifr_name);
 	string dummy_error_msg;
-	delete_vlan(parent_ifname, string(ifreq.ifr_name), dummy_error_msg);
+	delete_vlan(vlan_name, dummy_error_msg);
 	return (XORP_ERROR);
 
 #else // SIOCSIFNAME

diff --git a/xorp/site_scons/config/allconfig.py b/xorp/site_scons/config/allconfig.py
@@ -765,7 +765,7 @@ def DoAllConfig(env, conf, host_os):
         if not conf.CheckDeclaration('GET_VLAN_VID_CMD', '#include <linux/if_vlan.h>'):
             conf.Define('GET_VLAN_VID_CMD', '9')
     else:
-        if not (env.has_key('mingw') and env['mingw']):
+	if has_net_if_vlanvar_h or has_net_if_vlan_var_h:
             conf.Define('HAVE_VLAN_BSD')