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

Commit ecd62107 authored by Padmanabh Ratnakar's avatar Padmanabh Ratnakar Committed by David S. Miller
Browse files

be2net: Rename some struct members for clarity 



Renamed msix_vec_idx to eq_idx in be_eq_obj struct.
Renamed msix_vec_next_idx to eq_next_idx in be_adapter structure.
These members are used in INTX mode also.

Signed-off-by: default avatarSarveswara Rao Mygapula <sarveswararao.mygapula@emulex.com>
Signed-off-by: default avatarPadmanabh Ratnakar <padmanabh.ratnakar@emulex.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ae07b0b2

drivers/net/benet/be.h

+2 −2
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ struct be_eq_obj { 
	u16 min_eqd;		/* in usecs */

	u16 max_eqd;		/* in usecs */

	u16 cur_eqd;		/* in usecs */

	u8  msix_vec_idx;

	u8  eq_idx;



	struct napi_struct napi;

};
@@ -291,7 +291,7 @@ struct be_adapter { 
	u32 num_rx_qs;

	u32 big_page_size;	/* Compounded page size shared by rx wrbs */



	u8 msix_vec_next_idx;

	u8 eq_next_idx;

	struct be_drv_stats drv_stats;



	struct vlan_group *vlan_grp;

drivers/net/benet/be_main.c

+5 −5
Original line number Diff line number Diff line
@@ -1497,7 +1497,7 @@ static int be_tx_queues_create(struct be_adapter *adapter) 
	if (be_cmd_eq_create(adapter, eq, adapter->tx_eq.cur_eqd))

		goto tx_eq_free;



	adapter->tx_eq.msix_vec_idx = adapter->msix_vec_next_idx++;

	adapter->tx_eq.eq_idx = adapter->eq_next_idx++;





	/* Alloc TX eth compl queue */
@@ -1590,7 +1590,7 @@ static int be_rx_queues_create(struct be_adapter *adapter) 
		if (rc)

			goto err;



		rxo->rx_eq.msix_vec_idx = adapter->msix_vec_next_idx++;

		rxo->rx_eq.eq_idx = adapter->eq_next_idx++;



		/* CQ */

		cq = &rxo->cq;
@@ -1666,11 +1666,11 @@ static irqreturn_t be_intx(int irq, void *dev) 
		if (!isr)

			return IRQ_NONE;



		if ((1 << adapter->tx_eq.msix_vec_idx & isr))

		if ((1 << adapter->tx_eq.eq_idx & isr))

			event_handle(adapter, &adapter->tx_eq);



		for_all_rx_queues(adapter, rxo, i) {

			if ((1 << rxo->rx_eq.msix_vec_idx & isr))

			if ((1 << rxo->rx_eq.eq_idx & isr))

				event_handle(adapter, &rxo->rx_eq);

		}

	}
@@ -1951,7 +1951,7 @@ static void be_sriov_disable(struct be_adapter *adapter) 
static inline int be_msix_vec_get(struct be_adapter *adapter,

					struct be_eq_obj *eq_obj)

{

	return adapter->msix_entries[eq_obj->msix_vec_idx].vector;

	return adapter->msix_entries[eq_obj->eq_idx].vector;

}



static int be_request_irq(struct be_adapter *adapter,