Module Name: src Committed By: rtr Date: Thu Jul 31 03:39:36 UTC 2014
Modified Files: src/sys/dev/bluetooth: bthidev.c btmagic.c btsco.c src/sys/kern: uipc_socket.c uipc_socket2.c uipc_usrreq.c src/sys/net: link_proto.c raw_usrreq.c rtsock.c src/sys/netatalk: ddp_usrreq.c src/sys/netbt: hci_socket.c l2cap.h l2cap_socket.c l2cap_upper.c rfcomm.h rfcomm_session.c rfcomm_socket.c rfcomm_upper.c sco.h sco_socket.c sco_upper.c src/sys/netinet: raw_ip.c tcp_usrreq.c tcp_var.h udp_usrreq.c src/sys/netinet6: raw_ip6.c udp6_usrreq.c src/sys/netipsec: keysock.c src/sys/netmpls: mpls_proto.c src/sys/netnatm: natm.c src/sys/rump/net/lib/libsockin: sockin.c src/sys/sys: protosw.h un.h Log Message: split PRU_DISCONNECT, PRU_SHUTDOWN and PRU_ABORT function out of pr_generic() usrreq switches and put into separate functions xxx_disconnect(struct socket *) xxx_shutdown(struct socket *) xxx_abort(struct socket *) - always KASSERT(solocked(so)) even if not implemented - replace calls to pr_generic() with req = PRU_{DISCONNECT,SHUTDOWN,ABORT} with calls to pr_{disconnect,shutdown,abort}() respectively rename existing internal functions used to implement above functionality to permit use of the names for xxx_{disconnect,shutdown,abort}(). - {l2cap,sco,rfcomm}_disconnect() -> {l2cap,sco,rfcomm}_disconnect_pcb() - {unp,rip,tcp}_disconnect() -> {unp,rip,tcp}_disconnect1() - unp_shutdown() -> unp_shutdown1() patch reviewed by rmind To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/dev/bluetooth/bthidev.c cvs rdiff -u -r1.9 -r1.10 src/sys/dev/bluetooth/btmagic.c cvs rdiff -u -r1.31 -r1.32 src/sys/dev/bluetooth/btsco.c cvs rdiff -u -r1.228 -r1.229 src/sys/kern/uipc_socket.c cvs rdiff -u -r1.119 -r1.120 src/sys/kern/uipc_socket2.c cvs rdiff -u -r1.162 -r1.163 src/sys/kern/uipc_usrreq.c cvs rdiff -u -r1.18 -r1.19 src/sys/net/link_proto.c cvs rdiff -u -r1.46 -r1.47 src/sys/net/raw_usrreq.c cvs rdiff -u -r1.158 -r1.159 src/sys/net/rtsock.c cvs rdiff -u -r1.56 -r1.57 src/sys/netatalk/ddp_usrreq.c cvs rdiff -u -r1.35 -r1.36 src/sys/netbt/hci_socket.c cvs rdiff -u -r1.16 -r1.17 src/sys/netbt/l2cap.h src/sys/netbt/l2cap_upper.c cvs rdiff -u -r1.26 -r1.27 src/sys/netbt/l2cap_socket.c cvs rdiff -u -r1.15 -r1.16 src/sys/netbt/rfcomm.h cvs rdiff -u -r1.21 -r1.22 src/sys/netbt/rfcomm_session.c cvs rdiff -u -r1.27 -r1.28 src/sys/netbt/rfcomm_socket.c cvs rdiff -u -r1.18 -r1.19 src/sys/netbt/rfcomm_upper.c cvs rdiff -u -r1.9 -r1.10 src/sys/netbt/sco.h cvs rdiff -u -r1.28 -r1.29 src/sys/netbt/sco_socket.c cvs rdiff -u -r1.14 -r1.15 src/sys/netbt/sco_upper.c cvs rdiff -u -r1.138 -r1.139 src/sys/netinet/raw_ip.c cvs rdiff -u -r1.193 -r1.194 src/sys/netinet/tcp_usrreq.c cvs rdiff -u -r1.174 -r1.175 src/sys/netinet/tcp_var.h cvs rdiff -u -r1.211 -r1.212 src/sys/netinet/udp_usrreq.c cvs rdiff -u -r1.131 -r1.132 src/sys/netinet6/raw_ip6.c cvs rdiff -u -r1.110 -r1.111 src/sys/netinet6/udp6_usrreq.c cvs rdiff -u -r1.38 -r1.39 src/sys/netipsec/keysock.c cvs rdiff -u -r1.18 -r1.19 src/sys/netmpls/mpls_proto.c cvs rdiff -u -r1.40 -r1.41 src/sys/netnatm/natm.c cvs rdiff -u -r1.53 -r1.54 src/sys/rump/net/lib/libsockin/sockin.c cvs rdiff -u -r1.55 -r1.56 src/sys/sys/protosw.h cvs rdiff -u -r1.50 -r1.51 src/sys/sys/un.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.