[Open-FCoE] [PATCH 10/13] fcoe-utils: Don't read HAS_FIP from config file

Robert Love robert.w.love at intel.com
Thu Jul 2 16:28:42 UTC 2009


The HAS_FIP configuration value isn't used. The code is checking the
config files for this value, but then is not using it. This patch
removes the config file check.

Signed-off-by: Robert Love <robert.w.love at intel.com>
---

 fcoemon.c |   13 -------------
 fcoemon.h |    1 -
 2 files changed, 0 insertions(+), 14 deletions(-)

diff --git a/fcoemon.c b/fcoemon.c
index 55e05c0..b1872ae 100644
--- a/fcoemon.c
+++ b/fcoemon.c
@@ -88,7 +88,6 @@ struct fcoe_port_config {
 	struct fcoe_port_config *next;
 	char ifname[IFNAMSIZ];
 	int fcoe_enable;
-	int has_fip;
 	int dcb_required;
 	int dcb_app_0_enable;
 	int dcb_app_0_willing;
@@ -353,17 +352,6 @@ static int fcm_read_config_files(void)
 			curr->dcb_app_0_willing = DCB_APP_0_DEFAULT_WILLING;
 		}
 
-		/* HAS_FIP */
-		rc = fcm_read_config_variable(file, val,
-					      sizeof(val), fp, "HAS_FIP");
-		if (rc < 0) {
-			fclose(fp);
-			return -1;
-		}
-		/* if not found, default to "no" */
-		if (!strncasecmp(val, "yes", 3) && rc == 1)
-			curr->has_fip = 1;
-
 		fclose(fp);
 	}
 	closedir(dir);
@@ -637,7 +625,6 @@ static void fcm_fcoe_get_dcb_settings(struct fcm_fcoe *ff)
 		if (!strncmp(ff->ff_name, p->ifname, IFNAMSIZ)) {
 			ff->ff_app_info.enable = p->dcb_app_0_enable;
 			ff->ff_app_info.willing = p->dcb_app_0_willing;
-			ff->ff_has_fip = p->has_fip;
 			break;
 		}
 		p = p->next;
diff --git a/fcoemon.h b/fcoemon.h
index 105f4f6..57425e8 100644
--- a/fcoemon.h
+++ b/fcoemon.h
@@ -87,7 +87,6 @@ struct fcm_fcoe {
    struct feature_info   ff_app_info;      /* App feature info */
    struct feature_info   ff_llink_info;    /* LLink feature info */
    u_int32_t             ff_llink_status;  /* LLink status */
-   u_int32_t             ff_has_fip;       /* FIP is implemented */
    u_int64_t             ff_mac;           /* MAC address */
    int                   ff_vlan;          /* VLAN ID or -1 if none */
    u_int8_t              ff_operstate;     /* RFC 2863 operational status */




More information about the devel mailing list