Sophie

Sophie

distrib > Fedora > 15 > i386 > by-pkgid > 495bbe94e5126512132d69685e96e0d7 > files > 11

fcoe-utils-1.0.18-2.fc15.src.rpm

From 5aaaef140bf87138bca14a088a83a70b19fe4f23 Mon Sep 17 00:00:00 2001
From: Petr Sabata <psabata@redhat.com>
Date: Tue, 12 Apr 2011 15:38:04 +0000
Subject: [PATCH 10/16] fcoe-utils: Include fcoe_utils.h before scsi/scsi.h

The scsi/scsi.h header file defines 'SUCCESS' as 0x2002 which couses the
'SUCCESS' identifier in fcoe_status to get expanded, resulting in fcping
build failure. This patch prevents it by including fcoe_utils.h first.

Signed-off-by: Petr Sabata <psabata@redhat.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
---
 fcping.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/fcping.c b/fcping.c
index 76ce7e2..a68883d 100644
--- a/fcping.c
+++ b/fcping.c
@@ -47,6 +47,7 @@
 #include <linux/bsg.h>
 #include "net_types.h"
 #include "fc_types.h"
+#include "fcoe_utils.h"
 typedef uint8_t u8;
 #include <scsi/sg.h>
 #include <scsi/fc/fc_ns.h>
@@ -54,8 +55,6 @@ typedef uint8_t u8;
 #include <scsi/fc/fc_els.h>
 #include <scsi/scsi_bsg_fc.h>
 
-#include "fcoe_utils.h"
-
 static const char *cmdname;
 
 #define FC_MAX_PAYLOAD  (2112UL - sizeof(net32_t))
-- 
1.7.4.4