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

Commit fc543637 authored by Michal Schmidt's avatar Michal Schmidt Committed by David S. Miller
Browse files

bnx2x: remove the 'poll' module option 



'poll' was a debugging option, but turning it on these days leads to
kernel panic. Remove it.

Signed-off-by: default avatarMichal Schmidt <mschmidt@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0af2a0d0

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+1 −16
Original line number Original line Diff line number Diff line
@@ -117,10 +117,6 @@ static int dropless_fc; 
module_param(dropless_fc, int, 0);

module_param(dropless_fc, int, 0);

MODULE_PARM_DESC(dropless_fc, " Pause on exhausted host ring");

MODULE_PARM_DESC(dropless_fc, " Pause on exhausted host ring");





static int poll;

module_param(poll, int, 0);

MODULE_PARM_DESC(poll, " Use polling (for debug)");



static int mrrs = -1;

static int mrrs = -1;

module_param(mrrs, int, 0);

module_param(mrrs, int, 0);

MODULE_PARM_DESC(mrrs, " Force Max Read Req Size (0..3) (for debug)");

MODULE_PARM_DESC(mrrs, " Force Max Read Req Size (0..3) (for debug)");
@@ -4834,20 +4830,11 @@ void bnx2x_drv_pulse(struct bnx2x *bp) 




static void bnx2x_timer(unsigned long data)

static void bnx2x_timer(unsigned long data)

{

{

	u8 cos;

	struct bnx2x *bp = (struct bnx2x *) data;

	struct bnx2x *bp = (struct bnx2x *) data;





	if (!netif_running(bp->dev))

	if (!netif_running(bp->dev))

		return;

		return;





	if (poll) {

		struct bnx2x_fastpath *fp = &bp->fp[0];



		for_each_cos_in_tx_queue(fp, cos)

			bnx2x_tx_int(bp, &fp->txdata[cos]);

		bnx2x_rx_int(fp, 1000);

	}



	if (!BP_NOMCP(bp)) {

	if (!BP_NOMCP(bp)) {

		int mb_idx = BP_FW_MB_IDX(bp);

		int mb_idx = BP_FW_MB_IDX(bp);

		u32 drv_pulse;

		u32 drv_pulse;
@@ -10063,7 +10050,6 @@ static void __devinit bnx2x_set_modes_bitmap(struct bnx2x *bp) 
static int __devinit bnx2x_init_bp(struct bnx2x *bp)

static int __devinit bnx2x_init_bp(struct bnx2x *bp)

{

{

	int func;

	int func;

	int timer_interval;

	int rc;

	int rc;





	mutex_init(&bp->port.phy_mutex);

	mutex_init(&bp->port.phy_mutex);
@@ -10139,8 +10125,7 @@ static int __devinit bnx2x_init_bp(struct bnx2x *bp) 
	bp->tx_ticks = (50 / BNX2X_BTR) * BNX2X_BTR;

	bp->tx_ticks = (50 / BNX2X_BTR) * BNX2X_BTR;

	bp->rx_ticks = (25 / BNX2X_BTR) * BNX2X_BTR;

	bp->rx_ticks = (25 / BNX2X_BTR) * BNX2X_BTR;





	timer_interval = (CHIP_REV_IS_SLOW(bp) ? 5*HZ : HZ);

	bp->current_interval = CHIP_REV_IS_SLOW(bp) ? 5*HZ : HZ;

	bp->current_interval = (poll ? poll : timer_interval);





	init_timer(&bp->timer);

	init_timer(&bp->timer);

	bp->timer.expires = jiffies + bp->current_interval;

	bp->timer.expires = jiffies + bp->current_interval;