Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0a08a30 authored by Jing Huang's avatar Jing Huang Committed by James Bottomley
Browse files

[SCSI] bfa: fix frame size over 1024 compile warning 



Fix compile warning for frame size over 1024 in gcc 4.4.

Signed-off-by: default avatarJing Huang <huangj@brocade.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 53440260

drivers/scsi/bfa/bfad.c

+0 −17
Original line number Original line Diff line number Diff line
@@ -861,20 +861,6 @@ bfad_pci_uninit(struct pci_dev *pdev, struct bfad_s *bfad) 
	pci_set_drvdata(pdev, NULL);

	pci_set_drvdata(pdev, NULL);

}

}





void

bfad_fcs_port_cfg(struct bfad_s *bfad)

{

	struct bfa_lport_cfg_s  port_cfg;

	struct bfa_port_attr_s attr;

	char		symname[BFA_SYMNAME_MAXLEN];



	sprintf(symname, "%s-%d", BFAD_DRIVER_NAME, bfad->inst_no);

	memcpy(port_cfg.sym_name.symname, symname, strlen(symname));

	bfa_fcport_get_attr(&bfad->bfa, &attr);

	port_cfg.nwwn = attr.nwwn;

	port_cfg.pwwn = attr.pwwn;

}



bfa_status_t

bfa_status_t

bfad_drv_init(struct bfad_s *bfad)

bfad_drv_init(struct bfad_s *bfad)

{

{
@@ -1065,9 +1051,6 @@ bfad_start_ops(struct bfad_s *bfad) { 
	bfa_fcs_init(&bfad->bfa_fcs);

	bfa_fcs_init(&bfad->bfa_fcs);

	spin_unlock_irqrestore(&bfad->bfad_lock, flags);

	spin_unlock_irqrestore(&bfad->bfad_lock, flags);





	/* PPORT FCS config */

	bfad_fcs_port_cfg(bfad);



	retval = bfad_cfg_pport(bfad, BFA_LPORT_ROLE_FCP_IM);

	retval = bfad_cfg_pport(bfad, BFA_LPORT_ROLE_FCP_IM);

	if (retval != BFA_STATUS_OK) {

	if (retval != BFA_STATUS_OK) {

		if (bfa_sm_cmp_state(bfad, bfad_sm_initializing))

		if (bfa_sm_cmp_state(bfad, bfad_sm_initializing))

drivers/scsi/bfa/bfad_drv.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -309,7 +309,6 @@ void bfad_bfa_tmo(unsigned long data); 
void		bfad_init_timer(struct bfad_s *bfad);

void		bfad_init_timer(struct bfad_s *bfad);

int		bfad_pci_init(struct pci_dev *pdev, struct bfad_s *bfad);

int		bfad_pci_init(struct pci_dev *pdev, struct bfad_s *bfad);

void		bfad_pci_uninit(struct pci_dev *pdev, struct bfad_s *bfad);

void		bfad_pci_uninit(struct pci_dev *pdev, struct bfad_s *bfad);

void		bfad_fcs_port_cfg(struct bfad_s *bfad);

void		bfad_drv_uninit(struct bfad_s *bfad);

void		bfad_drv_uninit(struct bfad_s *bfad);

int		bfad_worker(void *ptr);

int		bfad_worker(void *ptr);

void		bfad_debugfs_init(struct bfad_port_s *port);

void		bfad_debugfs_init(struct bfad_port_s *port);

drivers/scsi/bfa/bfad_im.c

+14 −13
Original line number Original line Diff line number Diff line
@@ -915,12 +915,16 @@ bfad_im_slave_alloc(struct scsi_device *sdev) 
static u32

static u32

bfad_im_supported_speeds(struct bfa_s *bfa)

bfad_im_supported_speeds(struct bfa_s *bfa)

{

{

	struct bfa_ioc_attr_s ioc_attr;

	struct bfa_ioc_attr_s *ioc_attr;

	u32 supported_speed = 0;

	u32 supported_speed = 0;





	bfa_get_attr(bfa, &ioc_attr);

	ioc_attr = kzalloc(sizeof(struct bfa_ioc_attr_s), GFP_KERNEL);

	if (ioc_attr.adapter_attr.max_speed == BFA_PORT_SPEED_8GBPS) {

	if (!ioc_attr)

		if (ioc_attr.adapter_attr.is_mezz) {

		return 0;



	bfa_get_attr(bfa, ioc_attr);

	if (ioc_attr->adapter_attr.max_speed == BFA_PORT_SPEED_8GBPS) {

		if (ioc_attr->adapter_attr.is_mezz) {

			supported_speed |= FC_PORTSPEED_8GBIT |

			supported_speed |= FC_PORTSPEED_8GBIT |

				FC_PORTSPEED_4GBIT |

				FC_PORTSPEED_4GBIT |

				FC_PORTSPEED_2GBIT | FC_PORTSPEED_1GBIT;

				FC_PORTSPEED_2GBIT | FC_PORTSPEED_1GBIT;
@@ -929,12 +933,13 @@ bfad_im_supported_speeds(struct bfa_s *bfa) 
				FC_PORTSPEED_4GBIT |

				FC_PORTSPEED_4GBIT |

				FC_PORTSPEED_2GBIT;

				FC_PORTSPEED_2GBIT;

		}

		}

	} else if (ioc_attr.adapter_attr.max_speed == BFA_PORT_SPEED_4GBPS) {

	} else if (ioc_attr->adapter_attr.max_speed == BFA_PORT_SPEED_4GBPS) {

		supported_speed |=  FC_PORTSPEED_4GBIT | FC_PORTSPEED_2GBIT |

		supported_speed |=  FC_PORTSPEED_4GBIT | FC_PORTSPEED_2GBIT |

				FC_PORTSPEED_1GBIT;

				FC_PORTSPEED_1GBIT;

	} else if (ioc_attr.adapter_attr.max_speed == BFA_PORT_SPEED_10GBPS) {

	} else if (ioc_attr->adapter_attr.max_speed == BFA_PORT_SPEED_10GBPS) {

		supported_speed |= FC_PORTSPEED_10GBIT;

		supported_speed |= FC_PORTSPEED_10GBIT;

	}

	}

	kfree(ioc_attr);

	return supported_speed;

	return supported_speed;

}

}
@@ -944,9 +949,8 @@ bfad_os_fc_host_init(struct bfad_im_port_s *im_port) 
	struct Scsi_Host *host = im_port->shost;

	struct Scsi_Host *host = im_port->shost;

	struct bfad_s         *bfad = im_port->bfad;

	struct bfad_s         *bfad = im_port->bfad;

	struct bfad_port_s    *port = im_port->port;

	struct bfad_port_s    *port = im_port->port;

	struct bfa_port_attr_s pattr;

	struct bfa_lport_attr_s port_attr;

	char symname[BFA_SYMNAME_MAXLEN];

	char symname[BFA_SYMNAME_MAXLEN];

	struct bfa_fcport_s *fcport = BFA_FCPORT_MOD(&bfad->bfa);





	fc_host_node_name(host) =

	fc_host_node_name(host) =

		cpu_to_be64((bfa_fcs_lport_get_nwwn(port->fcs_port)));

		cpu_to_be64((bfa_fcs_lport_get_nwwn(port->fcs_port)));
@@ -964,15 +968,12 @@ bfad_os_fc_host_init(struct bfad_im_port_s *im_port) 
	/* For fibre channel services type 0x20 */

	/* For fibre channel services type 0x20 */

	fc_host_supported_fc4s(host)[7] = 1;

	fc_host_supported_fc4s(host)[7] = 1;





	bfa_fcs_lport_get_attr(&bfad->bfa_fcs.fabric.bport, &port_attr);

	strncpy(symname, bfad->bfa_fcs.fabric.bport.port_cfg.sym_name.symname,

	strncpy(symname, port_attr.port_cfg.sym_name.symname,

		BFA_SYMNAME_MAXLEN);

		BFA_SYMNAME_MAXLEN);

	sprintf(fc_host_symbolic_name(host), "%s", symname);

	sprintf(fc_host_symbolic_name(host), "%s", symname);





	fc_host_supported_speeds(host) = bfad_im_supported_speeds(&bfad->bfa);

	fc_host_supported_speeds(host) = bfad_im_supported_speeds(&bfad->bfa);



	fc_host_maxframe_size(host) = fcport->cfg.maxfrsize;  

	bfa_fcport_get_attr(&bfad->bfa, &pattr);

	fc_host_maxframe_size(host) = pattr.pport_cfg.maxfrsize;

}

}





static void

static void

drivers/scsi/bfa/bfa_defs_fcs.h

+1 −1

File changed.

Contains only whitespace changes.