From: Jean Tourrilhes <jt@bougret.hpl.hp.com>
To: Jeff Garzik <jgarzik@mandrakesoft.com>,
Linux kernel mailing list <linux-kernel@vger.kernel.org>
Subject: [PATCH 2.5.38] : Minor Wavelan fixes...
Date: Mon, 23 Sep 2002 17:20:15 -0700 [thread overview]
Message-ID: <20020924002014.GA13200@bougret.hpl.hp.com> (raw)
Hi Jeff,
Minor Wavelan fixes :
o use 'time_after' (contributed by Tim Schmielau)
o fix compile warning in my previous patch (Rene Scharfe)
o use 'inline' to try to minimise ethtool bloat (me)
Have fun...
Jean
----------------------------------------------------------
diff -u -p linux/drivers/net/wireless/wavelan_cs.b2.c linux/drivers/net/wireless/wavelan_cs.c
--- linux/drivers/net/wireless/wavelan_cs.b2.c Mon Sep 23 17:07:40 2002
+++ linux/drivers/net/wireless/wavelan_cs.c Mon Sep 23 17:12:54 2002
@@ -676,7 +676,7 @@ void wl_cell_expiry(unsigned long data)
while(wavepoint!=NULL)
{
- if(wavepoint->last_seen < jiffies-CELL_TIMEOUT)
+ if(time_after(jiffies, wavepoint->last_seen + CELL_TIMEOUT))
{
#ifdef WAVELAN_ROAMING_DEBUG
printk(KERN_DEBUG "WaveLAN: Bye bye %.4X\n",wavepoint->nwid);
@@ -1859,7 +1859,8 @@ wl_his_gather(device * dev,
}
#endif /* HISTOGRAM */
-static int netdev_ethtool_ioctl(struct net_device *dev, void *useraddr)
+static inline int
+wl_netdev_ethtool_ioctl(struct net_device *dev, void *useraddr)
{
u32 ethcmd;
@@ -2901,7 +2902,9 @@ wavelan_ioctl(struct net_device * dev, /
struct ifreq * rq, /* Data passed */
int cmd) /* Ioctl number */
{
+#if WIRELESS_EXT <= 12
struct iwreq * wrq = (struct iwreq *) rq;
+#endif
int ret = 0;
#ifdef DEBUG_IOCTL_TRACE
@@ -2912,7 +2915,7 @@ wavelan_ioctl(struct net_device * dev, /
switch(cmd)
{
case SIOCETHTOOL:
- ret = netdev_ethtool_ioctl(dev, (void *) rq->ifr_data);
+ ret = wl_netdev_ethtool_ioctl(dev, (void *) rq->ifr_data);
break;
#if WIRELESS_EXT <= 12
reply other threads:[~2002-09-24 0:15 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20020924002014.GA13200@bougret.hpl.hp.com \
--to=jt@bougret.hpl.hp.com \
--cc=jgarzik@mandrakesoft.com \
--cc=jt@hpl.hp.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®