From: Michael Brown <mcb30@ipxe.org>
Date: Sat, 27 Nov 2010 15:48:01 +0000 (+0000)
Subject: [fcoe] Use only the first instance of a FIP descriptor
X-Git-Tag: v1.20.1~2378
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54ec712ebeb6076ec1c958076da41c804fded378;p=thirdparty%2Fipxe.git

[fcoe] Use only the first instance of a FIP descriptor

Almost all FIP packets contain at most one instance of each
descriptor.  A VLAN notification may contain multiple VLAN
descriptors.  The FCoE specification does not provide any guidance
regarding prioritisation of VLANs, so we may choose to arbitrarily
choose the first listed VLAN.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---

diff --git a/src/net/fcoe.c b/src/net/fcoe.c
index c43fef61f..db2fc9806 100644
--- a/src/net/fcoe.c
+++ b/src/net/fcoe.c
@@ -533,7 +533,9 @@ static int fcoe_fip_parse ( struct fcoe_port *fcoe, struct fip_header *fiphdr,
 		/* Handle descriptors that we understand */
 		if ( ( desc_type > FIP_RESERVED ) &&
 		     ( desc_type < FIP_NUM_DESCRIPTOR_TYPES ) ) {
-			descs->desc[desc_type] = desc;
+			/* Use only the first instance of a descriptor */
+			if ( descs->desc[desc_type] == NULL )
+				descs->desc[desc_type] = desc;
 			continue;
 		}