Skip to content

Commit

Permalink
protosw: change prototype for pr_control
Browse files Browse the repository at this point in the history 
For some reason protosw.h is used during world complation and userland
is not aware of caddr_t, a relic from the first version of C.  Broken
buildworld is good reason to get rid of yet another caddr_t in kernel.

Fixes:	886fc1e
  • Loading branch information
@glebius
glebius committed Aug 12, 2022
1 parent 3a3af6b commit f277746
Show file tree
Hide file tree
Showing 16 changed files with 18 additions and 26 deletions.
2 changes: 1 addition & 1 deletion sys/kern/uipc_socket.c
View file
Expand Up @@ -3725,7 +3725,7 @@ pru_connect2_notsupp(struct socket *so1, struct socket *so2)
}

int
pru_control_notsupp(struct socket *so, u_long cmd, caddr_t data,
pru_control_notsupp(struct socket *so, u_long cmd, void *data,
struct ifnet *ifp, struct thread *td)
{

Expand Down
2 changes: 1 addition & 1 deletion sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
View file
Expand Up @@ -74,7 +74,7 @@ int ng_btsocket_hci_raw_bind (struct socket *, struct sockaddr *,
struct thread *);
int ng_btsocket_hci_raw_connect (struct socket *, struct sockaddr *,
struct thread *);
int ng_btsocket_hci_raw_control (struct socket *, u_long, caddr_t,
int ng_btsocket_hci_raw_control (struct socket *, u_long, void *,
struct ifnet *, struct thread *);
int ng_btsocket_hci_raw_ctloutput (struct socket *, struct sockopt *);
void ng_btsocket_hci_raw_detach (struct socket *);
Expand Down
4 changes: 2 additions & 2 deletions sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h
View file
Expand Up @@ -102,7 +102,7 @@ int ng_btsocket_l2cap_raw_bind (struct socket *, struct sockaddr *,
struct thread *);
int ng_btsocket_l2cap_raw_connect (struct socket *, struct sockaddr *,
struct thread *);
int ng_btsocket_l2cap_raw_control (struct socket *, u_long, caddr_t,
int ng_btsocket_l2cap_raw_control (struct socket *, u_long, void *,
struct ifnet *, struct thread *);
void ng_btsocket_l2cap_raw_detach (struct socket *);
int ng_btsocket_l2cap_raw_disconnect (struct socket *);
Expand Down Expand Up @@ -198,7 +198,7 @@ int ng_btsocket_l2cap_bind (struct socket *, struct sockaddr *,
struct thread *);
int ng_btsocket_l2cap_connect (struct socket *, struct sockaddr *,
struct thread *);
int ng_btsocket_l2cap_control (struct socket *, u_long, caddr_t,
int ng_btsocket_l2cap_control (struct socket *, u_long, void *,
struct ifnet *, struct thread *);
int ng_btsocket_l2cap_ctloutput (struct socket *, struct sockopt *);
void ng_btsocket_l2cap_detach (struct socket *);
Expand Down
2 changes: 1 addition & 1 deletion sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
View file
Expand Up @@ -323,7 +323,7 @@ int ng_btsocket_rfcomm_bind (struct socket *, struct sockaddr *,
struct thread *);
int ng_btsocket_rfcomm_connect (struct socket *, struct sockaddr *,
struct thread *);
int ng_btsocket_rfcomm_control (struct socket *, u_long, caddr_t,
int ng_btsocket_rfcomm_control (struct socket *, u_long, void *,
struct ifnet *, struct thread *);
int ng_btsocket_rfcomm_ctloutput (struct socket *, struct sockopt *);
void ng_btsocket_rfcomm_detach (struct socket *);
Expand Down
2 changes: 1 addition & 1 deletion sys/netgraph/bluetooth/include/ng_btsocket_sco.h
View file
Expand Up @@ -113,7 +113,7 @@ int ng_btsocket_sco_bind (struct socket *, struct sockaddr *,
struct thread *);
int ng_btsocket_sco_connect (struct socket *, struct sockaddr *,
struct thread *);
int ng_btsocket_sco_control (struct socket *, u_long, caddr_t,
int ng_btsocket_sco_control (struct socket *, u_long, void *,
struct ifnet *, struct thread *);
int ng_btsocket_sco_ctloutput (struct socket *, struct sockopt *);
void ng_btsocket_sco_detach (struct socket *);
Expand Down
2 changes: 1 addition & 1 deletion sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
View file
Expand Up @@ -1031,7 +1031,7 @@ ng_btsocket_hci_raw_connect(struct socket *so, struct sockaddr *nam,
*/

int
ng_btsocket_hci_raw_control(struct socket *so, u_long cmd, caddr_t data,
ng_btsocket_hci_raw_control(struct socket *so, u_long cmd, void *data,
struct ifnet *ifp, struct thread *td)
{
ng_btsocket_hci_raw_pcb_p pcb = so2hci_raw_pcb(so);
Expand Down
2 changes: 1 addition & 1 deletion sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
View file
Expand Up @@ -2280,7 +2280,7 @@ ng_btsocket_l2cap_connect(struct socket *so, struct sockaddr *nam,
*/

int
ng_btsocket_l2cap_control(struct socket *so, u_long cmd, caddr_t data,
ng_btsocket_l2cap_control(struct socket *so, u_long cmd, void *data,
struct ifnet *ifp, struct thread *td)
{
return (EINVAL);
Expand Down
2 changes: 1 addition & 1 deletion sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
View file
Expand Up @@ -784,7 +784,7 @@ ng_btsocket_l2cap_raw_connect(struct socket *so, struct sockaddr *nam,
*/

int
ng_btsocket_l2cap_raw_control(struct socket *so, u_long cmd, caddr_t data,
ng_btsocket_l2cap_raw_control(struct socket *so, u_long cmd, void *data,
struct ifnet *ifp, struct thread *td)
{
ng_btsocket_l2cap_raw_pcb_p pcb = so2l2cap_raw_pcb(so);
Expand Down
2 changes: 1 addition & 1 deletion sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
View file
Expand Up @@ -637,7 +637,7 @@ ng_btsocket_rfcomm_connect(struct socket *so, struct sockaddr *nam,
*/

int
ng_btsocket_rfcomm_control(struct socket *so, u_long cmd, caddr_t data,
ng_btsocket_rfcomm_control(struct socket *so, u_long cmd, void *data,
struct ifnet *ifp, struct thread *td)
{
return (EINVAL);
Expand Down
2 changes: 1 addition & 1 deletion sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
View file
Expand Up @@ -1445,7 +1445,7 @@ ng_btsocket_sco_connect(struct socket *so, struct sockaddr *nam,
*/

int
ng_btsocket_sco_control(struct socket *so, u_long cmd, caddr_t data,
ng_btsocket_sco_control(struct socket *so, u_long cmd, void *data,
struct ifnet *ifp, struct thread *td)
{
return (EINVAL);
Expand Down
2 changes: 1 addition & 1 deletion sys/netinet/in.c
View file
Expand Up @@ -324,7 +324,7 @@ in_socktrim(struct sockaddr_in *ap)
* Generic internet control operations (ioctl's).
*/
int
in_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp,
in_control(struct socket *so, u_long cmd, void *data, struct ifnet *ifp,
struct thread *td)
{
struct ifreq *ifr = (struct ifreq *)data;
Expand Down
2 changes: 1 addition & 1 deletion sys/netinet/in_var.h
View file
Expand Up @@ -444,7 +444,7 @@ int in_joingroup_locked(struct ifnet *, const struct in_addr *,
int in_leavegroup(struct in_multi *, /*const*/ struct in_mfilter *);
int in_leavegroup_locked(struct in_multi *,
/*const*/ struct in_mfilter *);
int in_control(struct socket *, u_long, caddr_t, struct ifnet *,
int in_control(struct socket *, u_long, void *, struct ifnet *,
struct thread *);
int in_addprefix(struct in_ifaddr *);
int in_scrubprefix(struct in_ifaddr *, u_int);
Expand Down
2 changes: 1 addition & 1 deletion sys/netinet6/in6.c
View file
Expand Up @@ -246,7 +246,7 @@ struct in6_ndifreq32 {
#endif

int
in6_control(struct socket *so, u_long cmd, caddr_t data,
in6_control(struct socket *so, u_long cmd, void *data,
struct ifnet *ifp, struct thread *td)
{
struct in6_ifreq *ifr = (struct in6_ifreq *)data;
Expand Down
2 changes: 1 addition & 1 deletion sys/netinet6/in6_var.h
View file
Expand Up @@ -881,7 +881,7 @@ int ip6_setmoptions(struct inpcb *, struct sockopt *);
#define IN6_IFAUPDATE_DADDELAY 0x1 /* first time to configure an address */

int in6_mask2len(struct in6_addr *, u_char *);
int in6_control(struct socket *, u_long, caddr_t, struct ifnet *,
int in6_control(struct socket *, u_long, void *, struct ifnet *,
struct thread *);
int in6_update_ifa(struct ifnet *, struct in6_aliasreq *,
struct in6_ifaddr *, int);
Expand Down
8 changes: 0 additions & 8 deletions sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c
View file
Expand Up @@ -1575,13 +1575,6 @@ sdp_ctlinput(int cmd, struct sockaddr *sa, void *vip)
sdp_pcbnotifyall(faddr, inetctlerrmap[cmd], sdp_notify);
}

static int
sdp_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp,
struct thread *td)
{
return (EOPNOTSUPP);
}

static void
sdp_keepalive_timeout(void *data)
{
Expand Down Expand Up @@ -1923,7 +1916,6 @@ struct pr_usrreqs sdp_usrreqs = {
.pru_attach = sdp_attach,
.pru_bind = sdp_bind,
.pru_connect = sdp_connect,
.pru_control = sdp_control,
.pru_detach = sdp_detach,
.pru_disconnect = sdp_disconnect,
.pru_listen = sdp_listen,
Expand Down
6 changes: 3 additions & 3 deletions sys/sys/protosw.h
View file
Expand Up @@ -79,8 +79,8 @@ typedef int pr_bind_t(struct socket *, struct sockaddr *, struct thread *);
typedef int pr_connect_t(struct socket *, struct sockaddr *,
struct thread *);
typedef int pr_connect2_t(struct socket *, struct socket *);
typedef int pr_control_t(struct socket *, u_long, caddr_t, struct ifnet *,
struct thread *);
typedef int pr_control_t(struct socket *, unsigned long, void *,
struct ifnet *, struct thread *);
typedef void pr_detach_t(struct socket *);
typedef int pr_disconnect_t(struct socket *);
typedef int pr_listen_t(struct socket *, int, struct thread *);
Expand Down Expand Up @@ -272,7 +272,7 @@ int pru_connect_notsupp(struct socket *so, struct sockaddr *nam,
int pru_connectat_notsupp(int fd, struct socket *so, struct sockaddr *nam,
struct thread *td);
int pru_connect2_notsupp(struct socket *so1, struct socket *so2);
int pru_control_notsupp(struct socket *so, u_long cmd, caddr_t data,
int pru_control_notsupp(struct socket *so, u_long cmd, void *data,
struct ifnet *ifp, struct thread *td);
int pru_disconnect_notsupp(struct socket *so);
int pru_listen_notsupp(struct socket *so, int backlog, struct thread *td);
Expand Down

0 comments on commit f277746

Please sign in to comment.