diff options
| author | bde <bde@FreeBSD.org> | 1997-04-20 15:36:12 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1997-04-20 15:36:12 +0000 |
| commit | 7963d92bf141d4bdfc3b096a7d4692b58713290b (patch) | |
| tree | 1ecd30e2210d317a9285526dd6e444875789dde6 /sys/netatalk | |
| parent | e34af1091c2a425d01698055f7065e5e0d61abec (diff) | |
| download | FreeBSD-src-7963d92bf141d4bdfc3b096a7d4692b58713290b.zip FreeBSD-src-7963d92bf141d4bdfc3b096a7d4692b58713290b.tar.gz | |
Fixed the type of timeout functions and removed casts that hid the
type mismatches. There was no problem in practice (at least on 386's).
Diffstat (limited to 'sys/netatalk')
| -rw-r--r-- | sys/netatalk/aarp.c | 7 | ||||
| -rw-r--r-- | sys/netatalk/at_control.c | 2 | ||||
| -rw-r--r-- | sys/netatalk/at_extern.h | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/sys/netatalk/aarp.c b/sys/netatalk/aarp.c index d81d177..7a9a71c 100644 --- a/sys/netatalk/aarp.c +++ b/sys/netatalk/aarp.c @@ -367,7 +367,7 @@ at_aarpinput( struct arpcom *ac, struct mbuf *m) * probed for the same address we'd like to use. Change the * address we're probing for. */ - untimeout((timeout_func_t) aarpprobe, ac ); + untimeout( aarpprobe, ac ); wakeup( aa ); m_freem( m ); return; @@ -518,8 +518,9 @@ out: void -aarpprobe( struct arpcom *ac ) +aarpprobe( void *arg ) { + struct arpcom *ac = arg; struct mbuf *m; struct ether_header *eh; struct ether_aarp *ea; @@ -551,7 +552,7 @@ aarpprobe( struct arpcom *ac ) wakeup( aa ); return; } else { - timeout( (timeout_func_t)aarpprobe, (caddr_t)ac, hz / 5 ); + timeout( aarpprobe, (caddr_t)ac, hz / 5 ); } if (( m = m_gethdr( M_DONTWAIT, MT_DATA )) == NULL ) { diff --git a/sys/netatalk/at_control.c b/sys/netatalk/at_control.c index ec3b997..16ef7c6 100644 --- a/sys/netatalk/at_control.c +++ b/sys/netatalk/at_control.c @@ -516,7 +516,7 @@ at_ifinit( ifp, aa, sat ) * start off the probes as an asynchronous activity. * though why wait 200mSec? */ - timeout( (timeout_func_t)aarpprobe, (caddr_t)ifp, hz / 5 ); + timeout( aarpprobe, (caddr_t)ifp, hz / 5 ); if ( tsleep( aa, PPAUSE|PCATCH, "at_ifinit", 0 )) { /* * theoretically we shouldn't time out here diff --git a/sys/netatalk/at_extern.h b/sys/netatalk/at_extern.h index 7e9478f..c25ca11 100644 --- a/sys/netatalk/at_extern.h +++ b/sys/netatalk/at_extern.h @@ -1,6 +1,6 @@ #ifdef _NETINET_IF_ETHER_H_ -extern void aarpprobe __P((struct arpcom *)); +extern timeout_t aarpprobe; extern int aarpresolve __P((struct arpcom *, struct mbuf *, struct sockaddr_at *, |
