From 0095a9213324a4466c10de98837a27ab1b7e72be Mon Sep 17 00:00:00 2001 From: Yi Zou Date: Fri, 28 Jan 2011 16:05:00 -0800 Subject: [PATCH] [SCSI] libfcoe: rename libfcoe.c to fcoe_cltr.c for the coming fcoe_transport.c The existing libfcoe.c is mostly for FIP support, rename it to reflect that fact and so we can add fcoe_transport.c to the make file to include both into the libfcoe kernel module. [ Minor modifications by Robert Love converting a few "__attribute__((packed))" modifiers to "__packed" to remove new checkpatch.pl WARNINGS ] Signed-off-by: Yi Zou Signed-off-by: Robert Love Signed-off-by: James Bottomley --- drivers/scsi/fcoe/Makefile | 2 ++ drivers/scsi/fcoe/{libfcoe.c => fcoe_ctlr.c} | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) rename drivers/scsi/fcoe/{libfcoe.c => fcoe_ctlr.c} (99%) diff --git a/drivers/scsi/fcoe/Makefile b/drivers/scsi/fcoe/Makefile index 950f27615c76..b122b7abddc6 100644 --- a/drivers/scsi/fcoe/Makefile +++ b/drivers/scsi/fcoe/Makefile @@ -1,2 +1,4 @@ obj-$(CONFIG_FCOE) += fcoe.o obj-$(CONFIG_LIBFCOE) += libfcoe.o + +libfcoe-objs := fcoe_ctlr.o diff --git a/drivers/scsi/fcoe/libfcoe.c b/drivers/scsi/fcoe/fcoe_ctlr.c similarity index 99% rename from drivers/scsi/fcoe/libfcoe.c rename to drivers/scsi/fcoe/fcoe_ctlr.c index a4757ca2a4ed..c12d0a7e0d3d 100644 --- a/drivers/scsi/fcoe/libfcoe.c +++ b/drivers/scsi/fcoe/fcoe_ctlr.c @@ -72,7 +72,7 @@ unsigned int libfcoe_debug_logging; module_param_named(debug_logging, libfcoe_debug_logging, int, S_IRUGO|S_IWUSR); MODULE_PARM_DESC(debug_logging, "a bit mask of logging levels"); -static const char *fcoe_ctlr_states[] = { +static const char * const fcoe_ctlr_states[] = { [FIP_ST_DISABLED] = "DISABLED", [FIP_ST_LINK_WAIT] = "LINK_WAIT", [FIP_ST_AUTO] = "AUTO", @@ -290,8 +290,8 @@ static void fcoe_ctlr_solicit(struct fcoe_ctlr *fip, struct fcoe_fcf *fcf) struct fip_mac_desc mac; struct fip_wwn_desc wwnn; struct fip_size_desc size; - } __attribute__((packed)) desc; - } __attribute__((packed)) *sol; + } __packed desc; + } __packed * sol; u32 fcoe_size; skb = dev_alloc_skb(sizeof(*sol)); @@ -438,7 +438,7 @@ static void fcoe_ctlr_send_keep_alive(struct fcoe_ctlr *fip, struct ethhdr eth; struct fip_header fip; struct fip_mac_desc mac; - } __attribute__((packed)) *kal; + } __packed * kal; struct fip_vn_desc *vn; u32 len; struct fc_lport *lp; @@ -509,7 +509,7 @@ static int fcoe_ctlr_encaps(struct fcoe_ctlr *fip, struct fc_lport *lport, struct ethhdr eth; struct fip_header fip; struct fip_encaps encaps; - } __attribute__((packed)) *cap; + } __packed * cap; struct fc_frame_header *fh; struct fip_mac_desc *mac; struct fcoe_fcf *fcf; @@ -1801,7 +1801,7 @@ static void fcoe_ctlr_vn_send(struct fcoe_ctlr *fip, struct fip_mac_desc mac; struct fip_wwn_desc wwnn; struct fip_vn_desc vn; - } __attribute__((packed)) *frame; + } __packed * frame; struct fip_fc4_feat *ff; struct fip_size_desc *size; u32 fcp_feat; -- 2.39.5