diff options
| author | Alexander Yurchenko <grange@cvs.openbsd.org> | 2009-02-06 22:07:05 +0000 |
|---|---|---|
| committer | Alexander Yurchenko <grange@cvs.openbsd.org> | 2009-02-06 22:07:05 +0000 |
| commit | 4ea92572c6bf8090d5a1aa27720c960a9373971a (patch) | |
| tree | ae7a7e60d10d7d20a2df0f86b2e30401eb280bb1 /sys/net | |
| parent | 59c0a8975d19d0178b056fd937721589190856f5 (diff) | |
Remove bogus casts of integer constants SPPPIO[GS]DEFS to caddr_t
and fix typo while here.
ok canacar@
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if_sppp.h | 8 | ||||
| -rw-r--r-- | sys/net/if_spppsubr.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/net/if_sppp.h b/sys/net/if_sppp.h index 50128c8ac39..31a65dd869c 100644 --- a/sys/net/if_sppp.h +++ b/sys/net/if_sppp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sppp.h,v 1.13 2007/12/04 19:49:52 claudio Exp $ */ +/* $OpenBSD: if_sppp.h,v 1.14 2009/02/06 22:07:04 grange Exp $ */ /* $NetBSD: if_sppp.h,v 1.2.2.1 1999/04/04 06:57:39 explorer Exp $ */ /* @@ -180,13 +180,13 @@ struct sppp { * In order to use this, create a struct spppreq, fill in the cmd * field with SPPPIOGDEFS, and put the address of this structure into * the ifr_data portion of a struct ifreq. Pass this struct to a - * SIOCGIFGENERIC ioctl. Then replace the cmd field by SPPPIOCDEFS, + * SIOCGIFGENERIC ioctl. Then replace the cmd field by SPPPIOSDEFS, * modify the defs field as desired, and pass the struct ifreq now * to a SIOCSIFGENERIC ioctl. */ -#define SPPPIOGDEFS ((caddr_t)(('S' << 24) + (1 << 16) + sizeof(struct sppp))) -#define SPPPIOSDEFS ((caddr_t)(('S' << 24) + (2 << 16) + sizeof(struct sppp))) +#define SPPPIOGDEFS ((int)(('S' << 24) + (1 << 16) + sizeof(struct sppp))) +#define SPPPIOSDEFS ((int)(('S' << 24) + (2 << 16) + sizeof(struct sppp))) struct spppreq { int cmd; diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c index 1f9f387a389..283416a7c5a 100644 --- a/sys/net/if_spppsubr.c +++ b/sys/net/if_spppsubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_spppsubr.c,v 1.71 2009/01/31 21:28:40 grange Exp $ */ +/* $OpenBSD: if_spppsubr.c,v 1.72 2009/02/06 22:07:04 grange Exp $ */ /* * Synchronous PPP/Cisco link level subroutines. * Keepalive protocol implemented in both Cisco and PPP modes. @@ -4866,7 +4866,7 @@ sppp_params(struct sppp *sp, u_long cmd, void *data) return EFAULT; switch (spr.cmd) { - case (int)SPPPIOGDEFS: + case SPPPIOGDEFS: if (cmd != SIOCGIFGENERIC) return EINVAL; /* @@ -4887,7 +4887,7 @@ sppp_params(struct sppp *sp, u_long cmd, void *data) bzero(spr.defs.hisauth.challenge, AUTHKEYLEN); return copyout(&spr, (caddr_t)ifr->ifr_data, sizeof spr); - case (int)SPPPIOSDEFS: + case SPPPIOSDEFS: if (cmd != SIOCSIFGENERIC) return EINVAL; /* |