diff options
| author |   Hannes Reinecke <hare@suse.de> | 2016-07-04 10:29:19 +0200 |
|---|---|---|
| committer |   Martin K. Petersen <martin.petersen@oracle.com> | 2016-07-13 22:05:28 -0400 |
| commit | 1917d42d14b744e7298872138dd281376a83a3fe (patch) | |
| tree | 57df7ccc23ecb551e1b2b19760adef062c8578e6 /include/scsi/libfcoe.h | |
| parent | fc_fip: Update to latest FC-BB-6 draft (diff) | |
| download | linux-dev-1917d42d14b744e7298872138dd281376a83a3fe.tar.xz linux-dev-1917d42d14b744e7298872138dd281376a83a3fe.zip | |
fcoe: use enum for fip_mode
The FIP mode is independent on the FIP state machine, so use a separate
enum for that instead of overloading it with state machine values.
Signed-off-by: Hannes Reinecke <hare@suse.com>
Acked-by: Johannes Thumshirn <jth@kernel.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'include/scsi/libfcoe.h')
| -rw-r--r-- | include/scsi/libfcoe.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h index c6fbbb6581d3..bcc5c3e82977 100644 --- a/include/scsi/libfcoe.h +++ b/include/scsi/libfcoe.h @@ -78,10 +78,12 @@ enum fip_state { * The mode is the state that is to be entered after link up. * It must not change after fcoe_ctlr_init() sets it. */ -#define FIP_MODE_AUTO FIP_ST_AUTO -#define FIP_MODE_NON_FIP FIP_ST_NON_FIP -#define FIP_MODE_FABRIC FIP_ST_ENABLED -#define FIP_MODE_VN2VN FIP_ST_VNMP_START +enum fip_mode { + FIP_MODE_AUTO = FIP_ST_AUTO, + FIP_MODE_NON_FIP, + FIP_MODE_FABRIC, + FIP_MODE_VN2VN, +}; /** * struct fcoe_ctlr - FCoE Controller and FIP state @@ -124,7 +126,7 @@ enum fip_state { */ struct fcoe_ctlr { enum fip_state state; - enum fip_state mode; + enum fip_mode mode; struct fc_lport *lp; struct fcoe_fcf *sel_fcf; struct list_head fcfs; @@ -311,7 +313,7 @@ struct fcoe_transport { struct list_head list; bool (*match) (struct net_device *device); int (*alloc) (struct net_device *device); - int (*create) (struct net_device *device, enum fip_state fip_mode); + int (*create) (struct net_device *device, enum fip_mode fip_mode); int (*destroy) (struct net_device *device); int (*enable) (struct net_device *device); int (*disable) (struct net_device *device); |