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
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Mon Sep 23 2002 - 22:00:41 EST