Hi,
Trivial Wavelan patch that dropped in my mailbox. Plus bloat
reduction. Low risk, 2.4.X ready (this fix is already going in 2.5.X).
Regards,
Jean
----------------------------------------------------
--- linux/drivers/net/pcmcia/wavelan_cs.b2.c Wed Sep 25 19:22:40 2002
+++ linux/drivers/net/pcmcia/wavelan_cs.c Wed Sep 25 19:25:15 2002
@@ -707,7 +707,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);
@@ -1890,7 +1890,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;
@@ -1933,7 +1934,7 @@ wavelan_ioctl(struct net_device * dev, /
#endif
if (cmd == SIOCETHTOOL)
- return netdev_ethtool_ioctl(dev, (void *) rq->ifr_data);
+ return wl_netdev_ethtool_ioctl(dev, (void *) rq->ifr_data);
/* Disable interrupts & save flags */
wv_splhi(lp, &flags);
-
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 30 2002 - 22:00:25 EST