From fb18efd6f68507dc15d83ec52ffccc9bd0ba8c0c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 05 2015 13:29:47 +0000 Subject: import libhbaapi-2.2.9-6.el7 --- diff --git a/SOURCES/libhbaapi-2.2.9-portspeed.patch b/SOURCES/libhbaapi-2.2.9-portspeed.patch new file mode 100644 index 0000000..304514b --- /dev/null +++ b/SOURCES/libhbaapi-2.2.9-portspeed.patch @@ -0,0 +1,44 @@ +From e135ff849b6538814096401d1b40159091505d14 Mon Sep 17 00:00:00 2001 +From: Chris Leech +Date: Wed, 17 Sep 2014 06:03:14 +0000 +Subject: [PATCH] libhbaapi: Add new HBA_PORTSPEED definitions. + +These extend the defined port speed API out to 40 GBit/sec, matching the +FDMI values from the latest FC-GS-7 draft. + +Signed-off-by: Chris Leech +Signed-off-by: Vasu Dev +--- + hbaapi.h | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +diff --git a/hbaapi.h b/hbaapi.h +index 58098e0..b94703b 100644 +--- a/hbaapi.h ++++ b/hbaapi.h +@@ -229,11 +229,17 @@ typedef HBA_UINT32 HBA_PORTSTATE; + + + typedef HBA_UINT32 HBA_PORTSPEED; +-#define HBA_PORTSPEED_UNKNOWN 0 /* Unknown - transceiver incable +- * of reporting */ +-#define HBA_PORTSPEED_1GBIT 1 /* 1 GBit/sec */ +-#define HBA_PORTSPEED_2GBIT 2 /* 2 GBit/sec */ +-#define HBA_PORTSPEED_10GBIT 4 /* 10 GBit/sec */ ++#define HBA_PORTSPEED_UNKNOWN 0x0000 /* Unknown - transceiver incable ++ * of reporting */ ++#define HBA_PORTSPEED_1GBIT 0x0001 /* 1 GBit/sec */ ++#define HBA_PORTSPEED_2GBIT 0x0002 /* 2 GBit/sec */ ++#define HBA_PORTSPEED_10GBIT 0x0004 /* 10 GBit/sec */ ++#define HBA_PORTSPEED_4GBIT 0x0008 /* 4 GBit/sec */ ++#define HBA_PORTSPEED_8GBIT 0x0010 /* 8 GBit/sec */ ++#define HBA_PORTSPEED_16GBIT 0x0020 /* 16 GBit/sec */ ++#define HBA_PORTSPEED_32GBIT 0x0040 /* 32 GBit/sec */ ++#define HBA_PORTSPEED_20GBIT 0x0080 /* 20 GBit/sec */ ++#define HBA_PORTSPEED_40GBIT 0x0100 /* 40 GBit/sec */ + #define HBA_PORTSPEED_NOT_NEGOTIATED (1 << 15) /* Speed not established */ + + +-- +1.9.3 + diff --git a/SPECS/libhbaapi.spec b/SPECS/libhbaapi.spec index 03862a8..0204084 100644 --- a/SPECS/libhbaapi.spec +++ b/SPECS/libhbaapi.spec @@ -1,6 +1,6 @@ Name: libhbaapi Version: 2.2.9 -Release: 5%{?dist} +Release: 6%{?dist} Summary: SNIA HBAAPI library Group: System Environment/Libraries License: SNIA @@ -8,6 +8,7 @@ URL: http://open-fcoe.org/ # This source was cloned from upstream git (libHBAAPI) Source: %{name}-%{version}.tar.gz Patch0: libhbaapi-2.2.9-dl-linking.patch +Patch1: libhbaapi-2.2.9-portspeed.patch BuildRequires: automake libtool %description @@ -27,6 +28,7 @@ developing applications that use %{name}. %prep %setup %patch0 -p1 -b .ld-linking +%patch1 -p1 -b .portspeed %build ./bootstrap.sh @@ -52,6 +54,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_libdir}/pkgconfig/*.pc %changelog +* Fri Oct 03 2014 Chris Leech - 2.2.9-6 +- 1087092 sync with upstream, adds new portspeed definitions + * Fri Jan 24 2014 Daniel Mach - 2.2.9-5 - Mass rebuild 2014-01-24