From: Stafford Horne <shorne@gmail.com>
To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
davem@davemloft.net, amitoj1606@gmail.com
Cc: shorne@gmail.com
Subject: [PATCH] 3c59x: Ensure to apply the expires time
Date: Sun, 28 Feb 2016 16:49:29 +0900 [thread overview]
Message-ID: <1456645769-2959-1-git-send-email-shorne@gmail.com> (raw)
In-Reply-To: <CA+5yK5GF4mCZe8xeDwnj7QOz1m2xz2HOVkO59wdsBktZ3kmzYA@mail.gmail.com>
In commit 5b6490def9168af6a ("3c59x: Use setup_timer()") Amitoj
removed add_timer which sets up the epires timer. In this patch
the behavior is restore but it uses mod_timer which is a bit more
compact.
Signed-off-by: Stafford Horne <shorne@gmail.com>
---
I think a patch like this will help restore the behavior. Also,
its small cleanup since we dont need to do separate set to expire
and call to add_timer. But thats a style preference.
drivers/net/ethernet/3com/3c59x.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c
index c377607..7b881ed 100644
--- a/drivers/net/ethernet/3com/3c59x.c
+++ b/drivers/net/ethernet/3com/3c59x.c
@@ -1602,7 +1602,7 @@ vortex_up(struct net_device *dev)
}
setup_timer(&vp->timer, vortex_timer, (unsigned long)dev);
- vp->timer.expires = RUN_AT(media_tbl[dev->if_port].wait);
+ mod_timer(&vp->timer, RUN_AT(media_tbl[dev->if_port].wait));
setup_timer(&vp->rx_oom_timer, rx_oom_timer, (unsigned long)dev);
if (vortex_debug > 1)
--
2.5.0
next prev parent reply other threads:[~2016-02-28 7:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-24 13:58 [PATCH 3/3] 3c59x: Use setup_timer() Amitoj Kaur Chawla
2016-02-25 21:52 ` David Miller
2016-02-27 18:48 ` Stafford Horne
2016-02-28 7:05 ` Amitoj Kaur Chawla
2016-02-28 7:49 ` Stafford Horne [this message]
2016-02-29 4:40 ` [PATCH] 3c59x: Ensure to apply the expires time David Miller
2016-02-28 7:53 ` [PATCH 3/3] 3c59x: Use setup_timer() Stafford Horne
2016-02-28 8:13 ` Amitoj Kaur Chawla
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=1456645769-2959-1-git-send-email-shorne@gmail.com \
--to=shorne@gmail.com \
--cc=amitoj1606@gmail.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).