Diff for /src/sys/sys/socketops.h between versions 1.3 and 1.4

version 1.3, 2004/03/06 01:58:57 version 1.4, 2004/03/19 17:00:06
Line 58  so_pru_soreceive(struct socket *so, stru Line 58  so_pru_soreceive(struct socket *so, stru
             controlp, flagsp));              controlp, flagsp));
 }  }
   
 #if defined(SMP) || defined(ALWAYS_MSG)  
   
 int so_pru_abort (struct socket *so);  int so_pru_abort (struct socket *so);
 int so_pru_accept (struct socket *so, struct sockaddr **nam);  int so_pru_accept (struct socket *so, struct sockaddr **nam);
 int so_pru_attach (struct socket *so, int proto, struct pru_attach_info *ai);  int so_pru_attach (struct socket *so, int proto, struct pru_attach_info *ai);
Line 84  int so_pru_sopoll (struct socket *so, in Line 82  int so_pru_sopoll (struct socket *so, in
                    struct thread *td);                     struct thread *td);
 int so_pr_ctloutput(struct socket *so, struct sockopt *sopt);  int so_pr_ctloutput(struct socket *so, struct sockopt *sopt);
   
 #else  
   
 #include <sys/protosw.h>  
   
 static __inline int  
 so_pru_abort(struct socket *so)  
 {  
         return ((*so->so_proto->pr_usrreqs->pru_abort)(so));  
 }  
   
 static __inline int  
 so_pru_accept(struct socket *so,  
     struct sockaddr **nam)  
 {  
         return ((*so->so_proto->pr_usrreqs->pru_accept)(so, nam));  
 }  
   
 static __inline int  
 so_pru_attach(struct socket *so, int proto, struct pru_attach_info *ai)  
 {  
         return ((*so->so_proto->pr_usrreqs->pru_attach)(so, proto, ai));  
 }  
   
 static __inline int  
 so_pru_bind(struct socket *so, struct sockaddr *nam, struct thread *td)  
 {  
         return ((*so->so_proto->pr_usrreqs->pru_bind)(so, nam, td));  
 }  
   
 static __inline int  
 so_pru_connect(struct socket *so, struct sockaddr *nam, struct thread *td)  
 {  
         return ((*so->so_proto->pr_usrreqs->pru_connect)(so, nam, td));  
 }  
   
 static __inline int  
 so_pru_connect2(struct socket *so1, struct socket *so2)  
 {  
         return ((*so1->so_proto->pr_usrreqs->pru_connect2)(so1, so2));  
 }  
   
 static __inline int  
 so_pru_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp,  
     struct thread *td)  
 {  
         return ((*so->so_proto->pr_usrreqs->pru_control)(so, cmd, data, ifp,  
             td));  
 }  
   
 static __inline int  
 so_pru_detach(struct socket *so)  
 {  
         return ((*so->so_proto->pr_usrreqs->pru_detach)(so));  
 }  
   
 static __inline int  
 so_pru_disconnect(struct socket *so)  
 {  
         return ((*so->so_proto->pr_usrreqs->pru_disconnect)(so));  
 }  
   
 static __inline int  
 so_pru_listen(struct socket *so, struct thread *td)  
 {  
         return ((*so->so_proto->pr_usrreqs->pru_listen)(so, td));  
 }  
   
 static __inline int  
 so_pru_peeraddr(struct socket *so,  
     struct sockaddr **nam)  
 {  
         return ((*so->so_proto->pr_usrreqs->pru_peeraddr)(so, nam));  
 }  
   
 static __inline int  
 so_pru_rcvd(struct socket *so, int flags)  
 {  
         return ((*so->so_proto->pr_usrreqs->pru_rcvd)(so, flags));  
 }  
   
 static __inline int  
 so_pru_rcvoob(struct socket *so, struct mbuf *m, int flags)  
 {  
         return ((*so->so_proto->pr_usrreqs->pru_rcvoob)(so, m, flags));  
 }  
   
 static __inline int  
 so_pru_send(struct socket *so, int flags, struct mbuf *m,  
     struct sockaddr *addr, struct mbuf *control, struct thread *td)  
 {  
         return ((*so->so_proto->pr_usrreqs->pru_send)(so, flags, m, addr,  
             control, td));  
 }  
   
 static __inline int  
 so_pru_sense(struct socket *so, struct stat *sb)  
 {  
         return ((*so->so_proto->pr_usrreqs->pru_sense)(so, sb));  
 }  
   
 static __inline int  
 so_pru_shutdown(struct socket *so)  
 {  
         return ((*so->so_proto->pr_usrreqs->pru_shutdown)(so));  
 }  
   
 static __inline int  
 so_pru_sockaddr(struct socket *so, struct sockaddr **nam)  
 {  
         return ((*so->so_proto->pr_usrreqs->pru_sockaddr)(so, nam));  
 }  
   
 static __inline int  
 so_pru_sopoll(struct socket *so, int events, struct ucred *cred,  
     struct thread *td)  
 {  
         return ((*so->so_proto->pr_usrreqs->pru_sopoll)(so, events, cred, td));  
 }  
   
 static __inline int  
 so_pr_ctloutput(struct socket *so, struct sockopt *sopt)  
 {  
         return ((*so->so_proto->pr_ctloutput)(so, sopt));  
 }  
   
 #endif  /* defined(SMP) || defined(ALWAYS_MSG) */  
   
 #endif  #endif

Removed from v.1.3  
changed lines
  Added in v.1.4