Fixed yet more ioctl breakage due to the type of the `cmd' arg changing
from int to u_long but not changing here.
This commit is contained in:
parent
bd3513170b
commit
f9d8181868
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=38343
@ -16,7 +16,7 @@
|
||||
*
|
||||
* From: Version 2.0, Fri Oct 6 20:39:21 MSK 1995
|
||||
*
|
||||
* $Id: if_sppp.h,v 1.6 1997/05/22 22:15:39 joerg Exp $
|
||||
* $Id: if_sppp.h,v 1.8 1997/10/11 11:25:20 joerg Exp $
|
||||
*/
|
||||
|
||||
#ifndef _NET_IF_HDLC_H_
|
||||
@ -152,7 +152,7 @@ struct spppreq {
|
||||
void sppp_attach (struct ifnet *ifp);
|
||||
void sppp_detach (struct ifnet *ifp);
|
||||
void sppp_input (struct ifnet *ifp, struct mbuf *m);
|
||||
int sppp_ioctl (struct ifnet *ifp, int cmd, void *data);
|
||||
int sppp_ioctl (struct ifnet *ifp, u_long cmd, void *data);
|
||||
struct mbuf *sppp_dequeue (struct ifnet *ifp);
|
||||
struct mbuf *sppp_pick(struct ifnet *ifp);
|
||||
int sppp_isempty (struct ifnet *ifp);
|
||||
|
@ -17,7 +17,7 @@
|
||||
*
|
||||
* From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997
|
||||
*
|
||||
* $Id: if_spppsubr.c,v 1.39 1998/05/17 11:53:14 phk Exp $
|
||||
* $Id: if_spppsubr.c,v 1.40 1998/06/21 14:53:25 bde Exp $
|
||||
*/
|
||||
|
||||
#include "opt_inet.h"
|
||||
@ -324,7 +324,7 @@ static const char *sppp_lcp_opt_name(u_char opt);
|
||||
static const char *sppp_phase_name(enum ppp_phase phase);
|
||||
static const char *sppp_proto_name(u_short proto);
|
||||
static const char *sppp_state_name(int state);
|
||||
static int sppp_params(struct sppp *sp, int cmd, void *data);
|
||||
static int sppp_params(struct sppp *sp, u_long cmd, void *data);
|
||||
static int sppp_strnlen(u_char *p, int max);
|
||||
static void sppp_get_ip_addrs(struct sppp *sp, u_long *src, u_long *dst,
|
||||
u_long *srcmask);
|
||||
@ -847,7 +847,7 @@ sppp_pick(struct ifnet *ifp)
|
||||
* Process an ioctl request. Called on low priority level.
|
||||
*/
|
||||
int
|
||||
sppp_ioctl(struct ifnet *ifp, int cmd, void *data)
|
||||
sppp_ioctl(struct ifnet *ifp, u_long cmd, void *data)
|
||||
{
|
||||
struct ifreq *ifr = (struct ifreq*) data;
|
||||
struct sppp *sp = (struct sppp*) ifp;
|
||||
@ -3765,9 +3765,9 @@ sppp_set_ip_addr(struct sppp *sp, u_long src)
|
||||
}
|
||||
|
||||
static int
|
||||
sppp_params(struct sppp *sp, int cmd, void *data)
|
||||
sppp_params(struct sppp *sp, u_long cmd, void *data)
|
||||
{
|
||||
int subcmd;
|
||||
u_long subcmd;
|
||||
struct ifreq *ifr = (struct ifreq *)data;
|
||||
struct spppreq spr;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user