From d4401b99a36e5170ccaa7defc0d2ac65b23f08c6 Mon Sep 17 00:00:00 2001 From: Kelly Hu Date: Wed, 8 Apr 2009 10:38:35 +0800 Subject: 6815792 fcoe need to consider link name changes on the fly 6815799 Remove mac_is_vnic() and move the check for vnic to libfcoe --- usr/src/uts/common/sys/fcoe/fcoe_common.h | 2 +- usr/src/uts/common/sys/fcoe/fcoeio.h | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) (limited to 'usr/src/uts/common/sys') diff --git a/usr/src/uts/common/sys/fcoe/fcoe_common.h b/usr/src/uts/common/sys/fcoe/fcoe_common.h index bad3c5a133..c59554c2e7 100644 --- a/usr/src/uts/common/sys/fcoe/fcoe_common.h +++ b/usr/src/uts/common/sys/fcoe/fcoe_common.h @@ -156,7 +156,7 @@ typedef struct fcoe_client { uint32_t ect_eport_flags; uint32_t ect_max_fc_frame_size; uint32_t ect_private_frame_struct_size; - char ect_channel_name[32]; + uint32_t ect_channelid; void *ect_client_port_struct; void (*ect_rx_frame)(fcoe_frame_t *frame); void (*ect_port_event)(fcoe_port_t *eport, uint32_t event); diff --git a/usr/src/uts/common/sys/fcoe/fcoeio.h b/usr/src/uts/common/sys/fcoe/fcoeio.h index 6d24a2673f..0167164058 100644 --- a/usr/src/uts/common/sys/fcoe/fcoeio.h +++ b/usr/src/uts/common/sys/fcoe/fcoeio.h @@ -26,6 +26,7 @@ #define _FCOEIO_H_ #include +#include #ifdef __cplusplus extern "C" { @@ -72,8 +73,7 @@ typedef enum { FCOEIOE_NEED_JUMBO_FRAME, FCOEIOE_MAC_NOT_FOUND, FCOEIOE_OFFLINE_FAILURE, - FCOEIOE_MORE_DATA, - FCOEIOE_VNIC_UNSUPPORT + FCOEIOE_MORE_DATA } fcoeio_stat_t; /* Biggest buffer length, can hold up to 1024 port instances */ @@ -112,15 +112,22 @@ typedef struct fcoeio_create_port_param { uint32_t fcp_pwwn_provided; uint32_t fcp_force_promisc; fcoe_cli_type_t fcp_port_type; - uchar_t fcp_mac_name[MAXLINKNAMELEN]; + datalink_id_t fcp_mac_linkid; + uint32_t fcp_rsvd0; } fcoeio_create_port_param_t; +typedef struct fcoeio_delete_port_param { + datalink_id_t fdp_mac_linkid; + uint32_t fdp_rsvd0; +} fcoeio_delete_port_param_t; + /* * FCOE port instance */ typedef struct fcoe_port_instance { uchar_t fpi_pwwn[FCOE_WWN_SIZE]; - uchar_t fpi_mac_link_name[MAXLINKNAMELEN]; + datalink_id_t fpi_mac_linkid; + uint32_t fpi_rsvd0; uint8_t fpi_mac_factory_addr[ETHERADDRL]; uint16_t fpi_mac_promisc; uint8_t fpi_mac_current_addr[ETHERADDRL]; -- cgit v1.2.3