Commit 98c99eb9 authored by Jean Tourrilhes's avatar Jean Tourrilhes Committed by Jeff Garzik

Minor Wavelan wireless net driver 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)
parent a9866881
...@@ -676,7 +676,7 @@ void wl_cell_expiry(unsigned long data) ...@@ -676,7 +676,7 @@ void wl_cell_expiry(unsigned long data)
while(wavepoint!=NULL) while(wavepoint!=NULL)
{ {
if(wavepoint->last_seen < jiffies-CELL_TIMEOUT) if(time_after(jiffies, wavepoint->last_seen + CELL_TIMEOUT))
{ {
#ifdef WAVELAN_ROAMING_DEBUG #ifdef WAVELAN_ROAMING_DEBUG
printk(KERN_DEBUG "WaveLAN: Bye bye %.4X\n",wavepoint->nwid); printk(KERN_DEBUG "WaveLAN: Bye bye %.4X\n",wavepoint->nwid);
...@@ -1859,7 +1859,8 @@ wl_his_gather(device * dev, ...@@ -1859,7 +1859,8 @@ wl_his_gather(device * dev,
} }
#endif /* HISTOGRAM */ #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; u32 ethcmd;
...@@ -2901,7 +2902,9 @@ wavelan_ioctl(struct net_device * dev, /* Device on wich the ioctl apply */ ...@@ -2901,7 +2902,9 @@ wavelan_ioctl(struct net_device * dev, /* Device on wich the ioctl apply */
struct ifreq * rq, /* Data passed */ struct ifreq * rq, /* Data passed */
int cmd) /* Ioctl number */ int cmd) /* Ioctl number */
{ {
#if WIRELESS_EXT <= 12
struct iwreq * wrq = (struct iwreq *) rq; struct iwreq * wrq = (struct iwreq *) rq;
#endif
int ret = 0; int ret = 0;
#ifdef DEBUG_IOCTL_TRACE #ifdef DEBUG_IOCTL_TRACE
...@@ -2912,7 +2915,7 @@ wavelan_ioctl(struct net_device * dev, /* Device on wich the ioctl apply */ ...@@ -2912,7 +2915,7 @@ wavelan_ioctl(struct net_device * dev, /* Device on wich the ioctl apply */
switch(cmd) switch(cmd)
{ {
case SIOCETHTOOL: case SIOCETHTOOL:
ret = netdev_ethtool_ioctl(dev, (void *) rq->ifr_data); ret = wl_netdev_ethtool_ioctl(dev, (void *) rq->ifr_data);
break; break;
#if WIRELESS_EXT <= 12 #if WIRELESS_EXT <= 12
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment