Any reason to keep this unused proc argument, in_control() does not have
it. Ok to kill it?
Index: netinet/tcp_usrreq.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/tcp_usrreq.c,v
retrieving revision 1.116
diff -u -p -r1.116 tcp_usrreq.c
--- netinet/tcp_usrreq.c 20 Oct 2013 11:03:01 -0000 1.116
+++ netinet/tcp_usrreq.c 20 Nov 2013 09:16:48 -0000
@@ -144,7 +144,7 @@ tcp_usrreq(so, req, m, nam, control, p)
#ifdef INET6
if (sotopf(so) == PF_INET6)
return in6_control(so, (u_long)m, (caddr_t)nam,
- (struct ifnet *)control, 0);
+ (struct ifnet *)control);
else
#endif /* INET6 */
return (in_control(so, (u_long)m, (caddr_t)nam,
Index: netinet/udp_usrreq.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/udp_usrreq.c,v
retrieving revision 1.170
diff -u -p -r1.170 udp_usrreq.c
--- netinet/udp_usrreq.c 20 Oct 2013 11:03:01 -0000 1.170
+++ netinet/udp_usrreq.c 20 Nov 2013 09:16:48 -0000
@@ -1128,7 +1128,7 @@ udp_usrreq(struct socket *so, int req, s
#ifdef INET6
if (inp->inp_flags & INP_IPV6)
return (in6_control(so, (u_long)m, (caddr_t)addr,
- (struct ifnet *)control, 0));
+ (struct ifnet *)control));
else
#endif /* INET6 */
return (in_control(so, (u_long)m, (caddr_t)addr,
Index: netinet6/in6.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet6/in6.c,v
retrieving revision 1.124
diff -u -p -r1.124 in6.c
--- netinet6/in6.c 13 Nov 2013 08:27:24 -0000 1.124
+++ netinet6/in6.c 20 Nov 2013 09:16:48 -0000
@@ -119,8 +119,7 @@ const struct in6_addr in6mask64 = IN6MAS
const struct in6_addr in6mask96 = IN6MASK96;
const struct in6_addr in6mask128 = IN6MASK128;
-int in6_lifaddr_ioctl(struct socket *, u_long, caddr_t, struct ifnet *,
- struct proc *);
+int in6_lifaddr_ioctl(struct socket *, u_long, caddr_t, struct ifnet *);
int in6_ifinit(struct ifnet *, struct in6_ifaddr *, int);
void in6_unlink_ifa(struct in6_ifaddr *, struct ifnet *);
void in6_ifloop_request(int, struct ifaddr *);
@@ -332,8 +331,7 @@ in6_mask2len(struct in6_addr *mask, u_ch
}
int
-in6_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp,
- struct proc *p)
+in6_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp)
{
struct in6_ifreq *ifr = (struct in6_ifreq *)data;
struct in6_ifaddr *ia = NULL;
@@ -389,7 +387,7 @@ in6_control(struct socket *so, u_long cm
return (EPERM);
/* FALLTHROUGH */
case SIOCGLIFADDR:
- return in6_lifaddr_ioctl(so, cmd, data, ifp, p);
+ return in6_lifaddr_ioctl(so, cmd, data, ifp);
}
/*
@@ -1301,8 +1299,8 @@ in6_unlink_ifa(struct in6_ifaddr *ia, st
* address encoding scheme. (see figure on page 8)
*/
int
-in6_lifaddr_ioctl(struct socket *so, u_long cmd, caddr_t data,
- struct ifnet *ifp, struct proc *p)
+in6_lifaddr_ioctl(struct socket *so, u_long cmd, caddr_t data,
+ struct ifnet *ifp)
{
struct if_laddrreq *iflr = (struct if_laddrreq *)data;
struct ifaddr *ifa;
@@ -1409,7 +1407,7 @@ in6_lifaddr_ioctl(struct socket *so, u_l
in6_prefixlen2mask(&ifra.ifra_prefixmask.sin6_addr, prefixlen);
ifra.ifra_flags = iflr->flags & ~IFLR_PREFIX;
- return in6_control(so, SIOCAIFADDR_IN6, (caddr_t)&ifra, ifp, p);
+ return in6_control(so, SIOCAIFADDR_IN6, (caddr_t)&ifra, ifp);
}
case SIOCGLIFADDR:
case SIOCDLIFADDR:
@@ -1505,7 +1503,7 @@ in6_lifaddr_ioctl(struct socket *so, u_l
ifra.ifra_flags = ia->ia6_flags;
return in6_control(so, SIOCDIFADDR_IN6, (caddr_t)&ifra,
- ifp, p);
+ ifp);
}
}
}
Index: netinet6/in6_var.h
===================================================================
RCS file: /home/ncvs/src/sys/netinet6/in6_var.h,v
retrieving revision 1.44
diff -u -p -r1.44 in6_var.h
--- netinet6/in6_var.h 24 Oct 2013 11:31:43 -0000 1.44
+++ netinet6/in6_var.h 20 Nov 2013 09:16:48 -0000
@@ -528,8 +528,7 @@ struct in6_multi *in6_addmulti(struct in
void in6_delmulti(struct in6_multi *);
struct in6_multi_mship *in6_joingroup(struct ifnet *, struct in6_addr *, int
*);
int in6_leavegroup(struct in6_multi_mship *);
-int in6_control(struct socket *, u_long, caddr_t, struct ifnet *,
- struct proc *);
+int in6_control(struct socket *, u_long, caddr_t, struct ifnet *);
int in6_update_ifa(struct ifnet *, struct in6_aliasreq *,
struct in6_ifaddr *);
void in6_purgeaddr(struct ifaddr *);
Index: netinet6/ip6_divert.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet6/ip6_divert.c,v
retrieving revision 1.15
diff -u -p -r1.15 ip6_divert.c
--- netinet6/ip6_divert.c 15 Nov 2013 16:46:15 -0000 1.15
+++ netinet6/ip6_divert.c 20 Nov 2013 09:16:48 -0000
@@ -277,7 +277,7 @@ divert6_usrreq(struct socket *so, int re
if (req == PRU_CONTROL) {
return (in6_control(so, (u_long)m, (caddr_t)addr,
- (struct ifnet *)control, p));
+ (struct ifnet *)control));
}
if (inp == NULL && req != PRU_ATTACH) {
error = EINVAL;
Index: netinet6/raw_ip6.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet6/raw_ip6.c,v
retrieving revision 1.61
diff -u -p -r1.61 raw_ip6.c
--- netinet6/raw_ip6.c 23 Oct 2013 19:57:50 -0000 1.61
+++ netinet6/raw_ip6.c 20 Nov 2013 09:16:48 -0000
@@ -597,7 +597,7 @@ rip6_usrreq(struct socket *so, int req,
if (req == PRU_CONTROL)
return (in6_control(so, (u_long)m, (caddr_t)nam,
- (struct ifnet *)control, p));
+ (struct ifnet *)control));
switch (req) {
case PRU_ATTACH:
