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

Commit f39857e1 authored by Ivan Vecera's avatar Ivan Vecera Committed by David S. Miller
Browse files

bna: remove oper_state_cbfn from struct bna_rxf 



Signed-off-by: default avatarIvan Vecera <ivecera@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ef5b67c1

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

+0 −15
Original line number Diff line number Diff line
@@ -119,21 +119,6 @@ do { \ 
	}								\

} while (0)



#define	call_rxf_pause_cbfn(rxf)					\

do {									\

	if ((rxf)->oper_state_cbfn) {					\

		void (*cbfn)(struct bnad *, struct bna_rx *);	\

		struct bnad *cbarg;					\

		cbfn = (rxf)->oper_state_cbfn;				\

		cbarg = (rxf)->oper_state_cbarg;			\

		(rxf)->oper_state_cbfn = NULL;				\

		(rxf)->oper_state_cbarg = NULL;				\

		cbfn(cbarg, rxf->rx);					\

	}								\

} while (0)



#define	call_rxf_resume_cbfn(rxf) call_rxf_pause_cbfn(rxf)



#define is_xxx_enable(mode, bitmask, xxx) ((bitmask & xxx) && (mode & xxx))



#define is_xxx_disable(mode, bitmask, xxx) ((bitmask & xxx) && !(mode & xxx))

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

+0 −6
Original line number Diff line number Diff line
@@ -103,12 +103,10 @@ bna_rxf_sm_stopped(struct bna_rxf *rxf, enum bna_rxf_event event) 


	case RXF_E_PAUSE:

		rxf->flags |= BNA_RXF_F_PAUSED;

		call_rxf_pause_cbfn(rxf);

		break;



	case RXF_E_RESUME:

		rxf->flags &= ~BNA_RXF_F_PAUSED;

		call_rxf_resume_cbfn(rxf);

		break;



	default:
@@ -119,7 +117,6 @@ bna_rxf_sm_stopped(struct bna_rxf *rxf, enum bna_rxf_event event) 
static void

bna_rxf_sm_paused_entry(struct bna_rxf *rxf)

{

	call_rxf_pause_cbfn(rxf);

}



static void
@@ -166,7 +163,6 @@ bna_rxf_sm_cfg_wait(struct bna_rxf *rxf, enum bna_rxf_event event) 
		bna_rxf_cfg_reset(rxf);

		call_rxf_start_cbfn(rxf);

		call_rxf_cam_fltr_cbfn(rxf);

		call_rxf_resume_cbfn(rxf);

		bfa_fsm_set_state(rxf, bna_rxf_sm_stopped);

		break;
@@ -197,7 +193,6 @@ bna_rxf_sm_started_entry(struct bna_rxf *rxf) 
{

	call_rxf_start_cbfn(rxf);

	call_rxf_cam_fltr_cbfn(rxf);

	call_rxf_resume_cbfn(rxf);

}



static void
@@ -238,7 +233,6 @@ bna_rxf_sm_fltr_clr_wait(struct bna_rxf *rxf, enum bna_rxf_event event) 
	switch (event) {

	case RXF_E_FAIL:

		bna_rxf_cfg_reset(rxf);

		call_rxf_pause_cbfn(rxf);

		bfa_fsm_set_state(rxf, bna_rxf_sm_stopped);

		break;

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

+0 −4
Original line number Diff line number Diff line
@@ -739,10 +739,6 @@ struct bna_rxf { 
	void (*stop_cbfn) (struct bna_rx *rx);

	struct bna_rx *stop_cbarg;



	/* callback for bna_rx_receive_pause() / bna_rx_receive_resume() */

	void (*oper_state_cbfn) (struct bnad *bnad, struct bna_rx *rx);

	struct bnad *oper_state_cbarg;



	/**

	 * callback for:

	 *	bna_rxf_ucast_set()