ioctl cmd arg is u_long

SCCS-vsn: sys/netinet/in_var.h 8.2
SCCS-vsn: sys/netinet/in.c 8.4
SCCS-vsn: sys/netinet/tcp_usrreq.c 8.3
SCCS-vsn: sys/netinet/ip_var.h 8.2
SCCS-vsn: sys/netinet/udp_usrreq.c 8.5

diff --git a/usr/src/sys/netinet/in.c b/usr/src/sys/netinet/in.c
index 3f1eb11..9c7bdb6 100644 (file)
--- a/usr/src/sys/netinet/in.c
+++ b/usr/src/sys/netinet/in.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)in.c        8.3 (Berkeley) %G%
+ *     @(#)in.c        8.4 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -132,7 +132,7 @@ extern      struct ifnet loif;
 /* ARGSUSED */
 in_control(so, cmd, data, ifp)
        struct socket *so;
 /* ARGSUSED */
 in_control(so, cmd, data, ifp)
        struct socket *so;

-       int cmd;
+       u_long cmd;

        caddr_t data;
        register struct ifnet *ifp;
 {
        caddr_t data;
        register struct ifnet *ifp;
 {

diff --git a/usr/src/sys/netinet/in_var.h b/usr/src/sys/netinet/in_var.h
index 151b065..d85c0f2 100644 (file)
--- a/usr/src/sys/netinet/in_var.h
+++ b/usr/src/sys/netinet/in_var.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)in_var.h    8.1 (Berkeley) %G%
+ *     @(#)in_var.h    8.2 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -170,5 +170,5 @@ int in_ifinit __P((struct ifnet *,
 struct in_multi *in_addmulti __P((struct in_addr *, struct ifnet *));
 int    in_delmulti __P((struct in_multi *));
 void   in_ifscrub __P((struct ifnet *, struct in_ifaddr *));
 struct in_multi *in_addmulti __P((struct in_addr *, struct ifnet *));
 int    in_delmulti __P((struct in_multi *));
 void   in_ifscrub __P((struct ifnet *, struct in_ifaddr *));

-int    in_control __P((struct socket *, int, caddr_t, struct ifnet *));
+int    in_control __P((struct socket *, u_long, caddr_t, struct ifnet *));

 #endif
 #endif

diff --git a/usr/src/sys/netinet/ip_var.h b/usr/src/sys/netinet/ip_var.h
index a2b6ff5..62f28cd 100644 (file)
--- a/usr/src/sys/netinet/ip_var.h
+++ b/usr/src/sys/netinet/ip_var.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ip_var.h    8.1 (Berkeley) %G%
+ *     @(#)ip_var.h    8.2 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -126,7 +126,7 @@ struct      ipq     ipq;                    /* ip reass. queue */
 u_short        ip_id;                          /* ip packet ctr, for ids */
 int    ip_defttl;                      /* default IP ttl */
 
 u_short        ip_id;                          /* ip packet ctr, for ids */
 int    ip_defttl;                      /* default IP ttl */
 

-int     in_control __P((struct socket *, int, caddr_t, struct ifnet *));
+int     in_control __P((struct socket *, u_long, caddr_t, struct ifnet *));

 int     ip_ctloutput __P((int, struct socket *, int, int, struct mbuf **));
 void    ip_deq __P((struct ipasfrag *));
 int     ip_dooptions __P((struct mbuf *));
 int     ip_ctloutput __P((int, struct socket *, int, int, struct mbuf **));
 void    ip_deq __P((struct ipasfrag *));
 int     ip_dooptions __P((struct mbuf *));

diff --git a/usr/src/sys/netinet/tcp_usrreq.c b/usr/src/sys/netinet/tcp_usrreq.c
index 39bd80b..27a2a6e 100644 (file)
--- a/usr/src/sys/netinet/tcp_usrreq.c
+++ b/usr/src/sys/netinet/tcp_usrreq.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tcp_usrreq.c        8.2 (Berkeley) %G%
+ *     @(#)tcp_usrreq.c        8.3 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -58,7 +58,7 @@ tcp_usrreq(so, req, m, nam, control)
 
 #if BSD>=43
        if (req == PRU_CONTROL)
 
 #if BSD>=43
        if (req == PRU_CONTROL)

-               return (in_control(so, (int)m, (caddr_t)nam,
+               return (in_control(so, (u_long)m, (caddr_t)nam,

                        (struct ifnet *)control));
        if (control && control->m_len) {
                m_freem(control);
                        (struct ifnet *)control));
        if (control && control->m_len) {
                m_freem(control);

diff --git a/usr/src/sys/netinet/udp_usrreq.c b/usr/src/sys/netinet/udp_usrreq.c
index e87d076..7692ffe 100644 (file)
--- a/usr/src/sys/netinet/udp_usrreq.c
+++ b/usr/src/sys/netinet/udp_usrreq.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)udp_usrreq.c        8.4 (Berkeley) %G%
+ *     @(#)udp_usrreq.c        8.5 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -451,7 +451,7 @@ udp_usrreq(so, req, m, addr, control)
        int s;
 
        if (req == PRU_CONTROL)
        int s;
 
        if (req == PRU_CONTROL)

-               return (in_control(so, (int)m, (caddr_t)addr,
+               return (in_control(so, (u_long)m, (caddr_t)addr,

                        (struct ifnet *)control));
        if (inp == NULL && req != PRU_ATTACH) {
                error = EINVAL;
                        (struct ifnet *)control));
        if (inp == NULL && req != PRU_ATTACH) {
                error = EINVAL;