From: Nishanth Aravamudan <nacc@us.ibm.com>
To: Adrian Bunk <bunk@stusta.de>
Cc: kj <kernel-janitors@osdl.org>, linux-kernel@vger.kernel.org
Subject: [KJ] Re: 2.6.10-rc1-kjt1: ixgb_ethtool.c doesn't compile
Date: Sat, 30 Oct 2004 22:52:58 +0000 [thread overview]
Message-ID: <20041030225258.GA1697@us.ibm.com> (raw)
In-Reply-To: <20041029235137.GG6677@stusta.de>
[-- Attachment #1: Type: text/plain, Size: 1924 bytes --]
On Sat, Oct 30, 2004 at 01:51:37AM +0200, Adrian Bunk wrote:
> On Sun, Oct 24, 2004 at 05:12:41PM +0200, maximilian attems wrote:
> >...
> > splitted out 168 patches:
> > http://debian.stro.at/kjt/2.6.10-rc1-kjt1/split/
>
> Could you provide a .tar.gz (or .tar.bz) of the splitted patches
> (similar to how Andrew does for -mm)?
>
> > thanks for feedback.
> > maks
> >...
>
> msleep_interruptible-drivers_net_ixgb_ixgb_ethtool.patch doesn't
> compile:
>
> <-- snip -->
>
> ...
> CC drivers/net/ixgb/ixgb_ethtool.o
> drivers/net/ixgb/ixgb_ethtool.c: In function `ixgb_ethtool_led_blink':
> drivers/net/ixgb/ixgb_ethtool.c:407: error: `id' undeclared (first use in this function)
> drivers/net/ixgb/ixgb_ethtool.c:407: error: (Each undeclared identifier is reported only once
> drivers/net/ixgb/ixgb_ethtool.c:407: error: for each function it appears in.)
> make[3]: *** [drivers/net/ixgb/ixgb_ethtool.o] Error 1
Here's the corrected patch, thanks again for catching this Adrian:
Description: Uses msleep_interruptible() instead of schedule_timeout()
to guarantee the task delays as expected.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
--- 2.6.10-rc1-vanilla/drivers/net/ixgb/ixgb_ethtool.c 2004-10-30 15:33:27.000000000 -0700
+++ 2.6.10-rc1/drivers/net/ixgb/ixgb_ethtool.c 2004-10-30 15:49:43.000000000 -0700
@@ -31,6 +31,7 @@
#include "ixgb.h"
#include <asm/uaccess.h>
+#include <linux/delay.h>
extern char ixgb_driver_name[];
extern char ixgb_driver_version[];
@@ -402,11 +403,10 @@ ixgb_ethtool_led_blink(struct net_device
mod_timer(&adapter->blink_timer, jiffies);
- set_current_state(TASK_INTERRUPTIBLE);
if (data)
- schedule_timeout(data * HZ);
+ msleep_interruptible(data * 1000);
else
- schedule_timeout(MAX_SCHEDULE_TIMEOUT);
+ msleep_interruptible(jiffies_to_msecs(MAX_SCHEDULE_TIMEOUT));
del_timer_sync(&adapter->blink_timer);
ixgb_led_off(&adapter->hw);
[-- Attachment #2: Type: text/plain, Size: 167 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
WARNING: multiple messages have this Message-ID (diff)
From: Nishanth Aravamudan <nacc@us.ibm.com>
To: Adrian Bunk <bunk@stusta.de>
Cc: kj <kernel-janitors@osdl.org>, linux-kernel@vger.kernel.org
Subject: Re: 2.6.10-rc1-kjt1: ixgb_ethtool.c doesn't compile
Date: Sat, 30 Oct 2004 15:52:58 -0700 [thread overview]
Message-ID: <20041030225258.GA1697@us.ibm.com> (raw)
In-Reply-To: <20041029235137.GG6677@stusta.de>
On Sat, Oct 30, 2004 at 01:51:37AM +0200, Adrian Bunk wrote:
> On Sun, Oct 24, 2004 at 05:12:41PM +0200, maximilian attems wrote:
> >...
> > splitted out 168 patches:
> > http://debian.stro.at/kjt/2.6.10-rc1-kjt1/split/
>
> Could you provide a .tar.gz (or .tar.bz) of the splitted patches
> (similar to how Andrew does for -mm)?
>
> > thanks for feedback.
> > maks
> >...
>
> msleep_interruptible-drivers_net_ixgb_ixgb_ethtool.patch doesn't
> compile:
>
> <-- snip -->
>
> ...
> CC drivers/net/ixgb/ixgb_ethtool.o
> drivers/net/ixgb/ixgb_ethtool.c: In function `ixgb_ethtool_led_blink':
> drivers/net/ixgb/ixgb_ethtool.c:407: error: `id' undeclared (first use in this function)
> drivers/net/ixgb/ixgb_ethtool.c:407: error: (Each undeclared identifier is reported only once
> drivers/net/ixgb/ixgb_ethtool.c:407: error: for each function it appears in.)
> make[3]: *** [drivers/net/ixgb/ixgb_ethtool.o] Error 1
Here's the corrected patch, thanks again for catching this Adrian:
Description: Uses msleep_interruptible() instead of schedule_timeout()
to guarantee the task delays as expected.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
--- 2.6.10-rc1-vanilla/drivers/net/ixgb/ixgb_ethtool.c 2004-10-30 15:33:27.000000000 -0700
+++ 2.6.10-rc1/drivers/net/ixgb/ixgb_ethtool.c 2004-10-30 15:49:43.000000000 -0700
@@ -31,6 +31,7 @@
#include "ixgb.h"
#include <asm/uaccess.h>
+#include <linux/delay.h>
extern char ixgb_driver_name[];
extern char ixgb_driver_version[];
@@ -402,11 +403,10 @@ ixgb_ethtool_led_blink(struct net_device
mod_timer(&adapter->blink_timer, jiffies);
- set_current_state(TASK_INTERRUPTIBLE);
if (data)
- schedule_timeout(data * HZ);
+ msleep_interruptible(data * 1000);
else
- schedule_timeout(MAX_SCHEDULE_TIMEOUT);
+ msleep_interruptible(jiffies_to_msecs(MAX_SCHEDULE_TIMEOUT));
del_timer_sync(&adapter->blink_timer);
ixgb_led_off(&adapter->hw);
next prev parent reply other threads:[~2004-10-30 22:52 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-10-24 15:12 [KJ] [announce] 2.6.10-rc1-kjt1 maximilian attems
2004-10-24 15:12 ` maximilian attems
2004-10-29 23:51 ` [KJ] 2.6.10-rc1-kjt1: ixgb_ethtool.c doesn't compile Adrian Bunk
2004-10-29 23:51 ` Adrian Bunk
2004-10-30 0:26 ` [KJ] " Randy.Dunlap
2004-10-30 0:26 ` Randy.Dunlap
2004-10-30 4:44 ` Nish Aravamudan
2004-10-30 4:44 ` Nish Aravamudan
2004-10-30 5:09 ` Adrian Bunk
2004-10-30 5:09 ` Adrian Bunk
2004-10-30 15:08 ` maximilian attems
2004-10-30 15:08 ` maximilian attems
2004-10-30 22:52 ` Nishanth Aravamudan [this message]
2004-10-30 22:52 ` Nishanth Aravamudan
2004-11-20 2:18 ` [KJ] [announce] 2.6.10-rc2-kjt1 patchset maximilian attems
2004-11-20 2:18 ` maximilian attems
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20041030225258.GA1697@us.ibm.com \
--to=nacc@us.ibm.com \
--cc=bunk@stusta.de \
--cc=kernel-janitors@osdl.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.