* [PATCH] bnx2x: remove the 'poll' module option
@ 2012-02-14 19:05 Michal Schmidt
2012-02-14 19:14 ` Eilon Greenstein
0 siblings, 1 reply; 3+ messages in thread
From: Michal Schmidt @ 2012-02-14 19:05 UTC (permalink / raw)
To: netdev; +Cc: eilong, gideonn
'poll' was a debugging option, but turning it on these days leads to
kernel panic. Remove it.
Signed-off-by: Michal Schmidt <mschmidt@redhat•com>
---
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 17 +----------------
1 files changed, 1 insertions(+), 16 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index ff19c3c..f4456ef 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -117,10 +117,6 @@ static int dropless_fc;
module_param(dropless_fc, int, 0);
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;
module_param(mrrs, int, 0);
MODULE_PARM_DESC(mrrs, " Force Max Read Req Size (0..3) (for debug)");
@@ -4853,20 +4849,11 @@ void bnx2x_drv_pulse(struct bnx2x *bp)
static void bnx2x_timer(unsigned long data)
{
- u8 cos;
struct bnx2x *bp = (struct bnx2x *) data;
if (!netif_running(bp->dev))
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)) {
int mb_idx = BP_FW_MB_IDX(bp);
u32 drv_pulse;
@@ -10121,7 +10108,6 @@ static void __devinit bnx2x_set_modes_bitmap(struct bnx2x *bp)
static int __devinit bnx2x_init_bp(struct bnx2x *bp)
{
int func;
- int timer_interval;
int rc;
mutex_init(&bp->port.phy_mutex);
@@ -10189,8 +10175,7 @@ static int __devinit bnx2x_init_bp(struct bnx2x *bp)
bp->tx_ticks = (50 / 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 = (poll ? poll : timer_interval);
+ bp->current_interval = CHIP_REV_IS_SLOW(bp) ? 5*HZ : HZ;
init_timer(&bp->timer);
bp->timer.expires = jiffies + bp->current_interval;
--
1.7.4.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] bnx2x: remove the 'poll' module option
2012-02-14 19:05 [PATCH] bnx2x: remove the 'poll' module option Michal Schmidt
@ 2012-02-14 19:14 ` Eilon Greenstein
2012-02-14 19:40 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Eilon Greenstein @ 2012-02-14 19:14 UTC (permalink / raw)
To: Michal Schmidt; +Cc: netdev, gideonn
On Tue, 2012-02-14 at 20:05 +0100, Michal Schmidt wrote:
> 'poll' was a debugging option, but turning it on these days leads to
> kernel panic. Remove it.
>
> Signed-off-by: Michal Schmidt <mschmidt@redhat•com>
Michal - thanks for taking care of it. Your help is truly appreciated.
Acked-by Eilon Greenstein <eilong@broadcom•com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] bnx2x: remove the 'poll' module option
2012-02-14 19:14 ` Eilon Greenstein
@ 2012-02-14 19:40 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2012-02-14 19:40 UTC (permalink / raw)
To: eilong; +Cc: mschmidt, netdev, gideonn
From: "Eilon Greenstein" <eilong@broadcom•com>
Date: Tue, 14 Feb 2012 21:14:02 +0200
> On Tue, 2012-02-14 at 20:05 +0100, Michal Schmidt wrote:
>> 'poll' was a debugging option, but turning it on these days leads to
>> kernel panic. Remove it.
>>
>> Signed-off-by: Michal Schmidt <mschmidt@redhat•com>
>
> Michal - thanks for taking care of it. Your help is truly appreciated.
>
> Acked-by Eilon Greenstein <eilong@broadcom•com>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-02-14 19:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-14 19:05 [PATCH] bnx2x: remove the 'poll' module option Michal Schmidt
2012-02-14 19:14 ` Eilon Greenstein
2012-02-14 19:40 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox