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

Commit 772b5235 authored by Rasesh Mody's avatar Rasesh Mody Committed by David S. Miller
Browse files

bna: Naming Change and Minor Macro Fix 



Naming changes: rename devid, BNAD_MAX_TXS, BNAD_MAX_RXS,
BNAD_MAX_RXPS_PER_RX to device, BNAD_MAX_TX, BNAD_MAX_RX,
BNAD_MAX_RXP_PER_RX respectively and change all the references.

Macro Fix: Add ioc_isr_mod_set check to bfa_nw_ioc_mbox_regisr macro

Signed-off-by: default avatarGurunatha Karaje <gkaraje@brocade.com>
Signed-off-by: default avatarRasesh Mody <rmody@brocade.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1bc144b6

drivers/net/ethernet/brocade/bna/bfa_defs.h

+4 −4
Original line number Diff line number Diff line
@@ -251,10 +251,10 @@ struct bfa_mfg_block { 
 * ---------------------- pci definitions ------------

 */



#define bfa_asic_id_ct(devid)			\

	((devid) == PCI_DEVICE_ID_BROCADE_CT ||	\

	(devid) == PCI_DEVICE_ID_BROCADE_CT_FC)

#define bfa_asic_id_ctc(devid) (bfa_asic_id_ct(devid))

#define bfa_asic_id_ct(device)			\

	((device) == PCI_DEVICE_ID_BROCADE_CT ||	\

	 (device) == PCI_DEVICE_ID_BROCADE_CT_FC)

#define bfa_asic_id_ctc(device) (bfa_asic_id_ct(device))



enum bfa_mode {

	BFA_MODE_HBA		= 1,

drivers/net/ethernet/brocade/bna/bfa_ioc.h

+4 −2
Original line number Diff line number Diff line
@@ -274,8 +274,10 @@ void bfa_nw_ioc_mbox_regisr(struct bfa_ioc *ioc, enum bfi_mclass mc, 
	((__ioc)->ioc_hwif->ioc_pll_init((__ioc)->pcidev.pci_bar_kva, \

			   (__ioc)->asic_mode))



#define	bfa_ioc_isr_mode_set(__ioc, __msix)			\

			((__ioc)->ioc_hwif->ioc_isr_mode_set(__ioc, __msix))

#define	bfa_ioc_isr_mode_set(__ioc, __msix) do {			\

	if ((__ioc)->ioc_hwif->ioc_isr_mode_set)			\

		((__ioc)->ioc_hwif->ioc_isr_mode_set(__ioc, __msix));	\

} while (0)

#define	bfa_ioc_ownership_reset(__ioc)				\

			((__ioc)->ioc_hwif->ioc_ownership_reset(__ioc))

drivers/net/ethernet/brocade/bna/bnad.c

+3 −3
Original line number Diff line number Diff line
@@ -1001,7 +1001,7 @@ bnad_cb_rx_cleanup(struct bnad *bnad, struct bna_rx *rx) 


	mdelay(BNAD_TXRX_SYNC_MDELAY);



	for (i = 0; i < BNAD_MAX_RXPS_PER_RX; i++) {

	for (i = 0; i < BNAD_MAX_RXP_PER_RX; i++) {

		rx_ctrl = &rx_info->rx_ctrl[i];

		ccb = rx_ctrl->ccb;

		if (!ccb)
@@ -1030,7 +1030,7 @@ bnad_cb_rx_post(struct bnad *bnad, struct bna_rx *rx) 
	int i;

	int j;



	for (i = 0; i < BNAD_MAX_RXPS_PER_RX; i++) {

	for (i = 0; i < BNAD_MAX_RXP_PER_RX; i++) {

		rx_ctrl = &rx_info->rx_ctrl[i];

		ccb = rx_ctrl->ccb;

		if (!ccb)
@@ -2227,7 +2227,7 @@ bnad_q_num_init(struct bnad *bnad) 
	int rxps;



	rxps = min((uint)num_online_cpus(),

			(uint)(BNAD_MAX_RXS * BNAD_MAX_RXPS_PER_RX));

			(uint)(BNAD_MAX_RX * BNAD_MAX_RXP_PER_RX));



	if (!(bnad->cfg_flags & BNAD_CF_MSIX))

		rxps = 1;	/* INTx */

drivers/net/ethernet/brocade/bna/bnad.h

+10 −10
Original line number Diff line number Diff line
@@ -38,12 +38,12 @@ 
#define BNAD_TXQ_DEPTH		2048

#define BNAD_RXQ_DEPTH		2048



#define BNAD_MAX_TXS		1

#define BNAD_MAX_TX		1

#define BNAD_MAX_TXQ_PER_TX	8	/* 8 priority queues */

#define BNAD_TXQ_NUM		1



#define BNAD_MAX_RXS		1

#define BNAD_MAX_RXPS_PER_RX	16

#define BNAD_MAX_RX		1

#define BNAD_MAX_RXP_PER_RX	16

#define BNAD_MAX_RXQ_PER_RXP	2



/*
@@ -190,7 +190,7 @@ struct bnad_tx_info { 
struct bnad_rx_info {

	struct bna_rx *rx; /* 1:1 between rx_info & rx */



	struct bnad_rx_ctrl rx_ctrl[BNAD_MAX_RXPS_PER_RX];

	struct bnad_rx_ctrl rx_ctrl[BNAD_MAX_RXP_PER_RX];

	u32 rx_id;

} ____cacheline_aligned;
@@ -234,8 +234,8 @@ struct bnad { 
	struct net_device	*netdev;



	/* Data path */

	struct bnad_tx_info tx_info[BNAD_MAX_TXS];

	struct bnad_rx_info rx_info[BNAD_MAX_RXS];

	struct bnad_tx_info tx_info[BNAD_MAX_TX];

	struct bnad_rx_info rx_info[BNAD_MAX_RX];



	unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];

	/*
@@ -255,8 +255,8 @@ struct bnad { 
	u8			tx_coalescing_timeo;

	u8			rx_coalescing_timeo;



	struct bna_rx_config rx_config[BNAD_MAX_RXS];

	struct bna_tx_config tx_config[BNAD_MAX_TXS];

	struct bna_rx_config rx_config[BNAD_MAX_RX];

	struct bna_tx_config tx_config[BNAD_MAX_TX];



	void __iomem		*bar0;	/* BAR0 address */
@@ -283,8 +283,8 @@ struct bnad { 
	/* Control path resources, memory & irq */

	struct bna_res_info res_info[BNA_RES_T_MAX];

	struct bna_res_info mod_res_info[BNA_MOD_RES_T_MAX];

	struct bnad_tx_res_info tx_res_info[BNAD_MAX_TXS];

	struct bnad_rx_res_info rx_res_info[BNAD_MAX_RXS];

	struct bnad_tx_res_info tx_res_info[BNAD_MAX_TX];

	struct bnad_rx_res_info rx_res_info[BNAD_MAX_RX];



	struct bnad_completion bnad_completions;