Permalink
Browse files

fcoe-utils: Update fcoe-utils to use lldpad and not dcbd

This patch does three things,

1) dcbd is deprecated use lldpad for pkg dependencies.

2) fcoemon includes header files that are not needed from
   dcbd. Removes these and use the correct lldpad headers
   the dcbd name is deprecated.

3) In an ugly chain of header files fcoemon was using the
   header files from lldpad for sys/stat.h. After lldpad
   header files were cleaned up to prevent this sort of
   chaining this fix is needed.

Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
  • Loading branch information...
1 parent 24b3dbd commit 0f07bc80b93a1c2e51db9a801e0d0d2c927bd570 @jrfastab jrfastab committed with Robert Love Jan 8, 2011
Showing with 8 additions and 9 deletions.
  1. +2 −2 configure.ac
  2. +2 −2 fcoe-utils.spec.in
  3. +4 −5 fcoemon.c
View
4 configure.ac
@@ -9,8 +9,8 @@ PKG_CHECK_MODULES([HBAAPI], [HBAAPI])
AC_SUBST([HBAAPI_CFLAGS])
AC_SUBST([HBAAPI_LIBS])
-PKG_CHECK_MODULES([DCBD], [dcbd])
-AC_SUBST([DCBD_CFLAGS])
+PKG_CHECK_MODULES([LLDPAD], [lldpad])
+AC_SUBST([LLDPAD_CFLAGS])
AC_CONFIG_FILES([Makefile fcoe-utils.spec include/fcoe_utils_version.h])
AC_OUTPUT
View
4 fcoe-utils.spec.in
@@ -9,8 +9,8 @@ URL: http://www.open-fcoe.org
Source0: http://www.open-fcoe.org/openfc/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libHBAAPI-devel dcbd-devel
-Requires: dcbd
+BuildRequires: libHBAAPI-devel lldpad-devel
+Requires: lldpad
Requires(post): chkconfig
Requires(preun): chkconfig initscripts
Requires(postun): initscripts
View
9 fcoemon.c
@@ -30,6 +30,7 @@
#include <unistd.h>
#include <paths.h>
#include <dirent.h>
+#include <sys/stat.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/queue.h>
@@ -44,11 +45,9 @@
#include <linux/ethtool.h>
#include <linux/if_vlan.h>
-#include <dcbd/dcb_types.h>
-#include <dcbd/dcbtool.h> /* for typedef cmd_status */
-#include <dcbd/clif.h>
-#include <dcbd/clif_cmds.h>
-#include <dcbd/common.h> /* for event msg level definitions */
+#include <lldpad/dcb_types.h>
+#include <lldpad/clif.h>
+#include <lldpad/clif_cmds.h>
#include "fcoe_utils_version.h"
#include "fcoemon_utils.h"

0 comments on commit 0f07bc8

Please sign in to comment.