click: Enable building click.

Not sure if it works, but at least it builds now. Signed-off-by: Ben Greear <greearb@candelatech.com>
greearb · Oct 3, 2011 · d295954 · d295954
1 parent 3f29f6e
commit d295954
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 3 deletions.
diff --git a/xorp/fea/data_plane/control_socket/click_socket.cc b/xorp/fea/data_plane/control_socket/click_socket.cc
@@ -738,7 +738,6 @@ ClickSocket::mount_click_file_system(string& error_msg)
 #ifdef HOST_OS_LINUX
     ret_value = mount("none", _kernel_click_mount_directory.c_str(),
 		      CLICK_FILE_SYSTEM_TYPE.c_str(), 0, 0);
-#else // ! HOST_OS_LINUX
 #elif defined(__NetBSD__) && __NetBSD_Version__ >= 499002400
     ret_value = mount(CLICK_FILE_SYSTEM_TYPE.c_str(),
 		      _kernel_click_mount_directory.c_str(), 0, 0, 0);

diff --git a/xorp/fea/data_plane/ifconfig/ifconfig_set_click.cc b/xorp/fea/data_plane/ifconfig/ifconfig_set_click.cc
@@ -282,8 +282,6 @@ IfConfigSetClick::config_vif_begin(const IfTreeInterface* pulled_ifp,
 	vifp->set_loopback(pulled_vifp->loopback());
 	vifp->set_point_to_point(pulled_vifp->point_to_point());
 	vifp->set_multicast(pulled_vifp->multicast());
-	vifp->set_vlan(pulled_vifp->is_vlan());
-	vifp->set_vlan_id(pulled_vifp->vlan_id());
     }
 
     return (XORP_OK);