svn commit: r242327 - in head/sys: netinet netinet6

[Michael Tuexen]

Author: tuexen
Date: Mon Oct 29 20:47:32 2012
New Revision: 242327
URL: http://svn.freebsd.org/changeset/base/242327

Log:
  Whitespace changes due to upstream integration of SCTP changes in the
  FreeBSD code base.

Modified:
  head/sys/netinet/sctp_uio.h
  head/sys/netinet/sctp_var.h
  head/sys/netinet6/sctp6_var.h

Modified: head/sys/netinet/sctp_uio.h
==============================================================================
--- head/sys/netinet/sctp_uio.h	Mon Oct 29 20:44:29 2012	(r242326)
+++ head/sys/netinet/sctp_uio.h	Mon Oct 29 20:47:32 2012	(r242327)
@@ -1278,33 +1278,39 @@ void sctp_freeladdrs(struct sockaddr *);
 int sctp_opt_info(int, sctp_assoc_t, int, void *, socklen_t *);
 
 /* deprecated */
-ssize_t sctp_sendmsg 
-(int, const void *, size_t, const struct sockaddr *,
+ssize_t 
+sctp_sendmsg(int, const void *, size_t, const struct sockaddr *,
     socklen_t, uint32_t, uint32_t, uint16_t, uint32_t, uint32_t);
 
 /* deprecated */
-	ssize_t sctp_send(int, const void *, size_t,
-              const struct sctp_sndrcvinfo *, int);
+ssize_t 
+sctp_send(int, const void *, size_t,
+    const struct sctp_sndrcvinfo *, int);
 
 /* deprecated */
-	ssize_t sctp_sendx(int, const void *, size_t, struct sockaddr *,
-               int, struct sctp_sndrcvinfo *, int);
+ssize_t 
+sctp_sendx(int, const void *, size_t, struct sockaddr *,
+    int, struct sctp_sndrcvinfo *, int);
 
 /* deprecated */
-	ssize_t sctp_sendmsgx(int sd, const void *, size_t, struct sockaddr *,
-                  int, uint32_t, uint32_t, uint16_t, uint32_t, uint32_t);
+ssize_t 
+sctp_sendmsgx(int sd, const void *, size_t, struct sockaddr *,
+    int, uint32_t, uint32_t, uint16_t, uint32_t, uint32_t);
 
-	sctp_assoc_t sctp_getassocid(int, struct sockaddr *);
+sctp_assoc_t sctp_getassocid(int, struct sockaddr *);
 
 /* deprecated */
-	ssize_t sctp_recvmsg(int, void *, size_t, struct sockaddr *, socklen_t *,
-                 struct sctp_sndrcvinfo *, int *);
-
-	ssize_t sctp_sendv(int, const struct iovec *, int, struct sockaddr *,
-               int, void *, socklen_t, unsigned int, int);
-
-	ssize_t sctp_recvv(int, const struct iovec *, int, struct sockaddr *,
-               socklen_t *, void *, socklen_t *, unsigned int *, int *);
+ssize_t 
+sctp_recvmsg(int, void *, size_t, struct sockaddr *, socklen_t *,
+    struct sctp_sndrcvinfo *, int *);
+
+ssize_t 
+sctp_sendv(int, const struct iovec *, int, struct sockaddr *,
+    int, void *, socklen_t, unsigned int, int);
+
+ssize_t 
+sctp_recvv(int, const struct iovec *, int, struct sockaddr *,
+    socklen_t *, void *, socklen_t *, unsigned int *, int *);
 
 __END_DECLS
 

Modified: head/sys/netinet/sctp_var.h
==============================================================================
--- head/sys/netinet/sctp_var.h	Mon Oct 29 20:44:29 2012	(r242326)
+++ head/sys/netinet/sctp_var.h	Mon Oct 29 20:47:32 2012	(r242327)
@@ -321,48 +321,34 @@ struct sctphdr;
 
 void sctp_close(struct socket *so);
 int sctp_disconnect(struct socket *so);
-
 void sctp_ctlinput(int, struct sockaddr *, void *);
 int sctp_ctloutput(struct socket *, struct sockopt *);
 
 #ifdef INET
 void sctp_input_with_port(struct mbuf *, int, uint16_t);
-
-#endif
-#ifdef INET
 void sctp_input(struct mbuf *, int);
 
 #endif
 void sctp_pathmtu_adjustment(struct sctp_tcb *, uint16_t);
 void sctp_drain(void);
 void sctp_init(void);
-
 void sctp_finish(void);
-
 int sctp_flush(struct socket *, int);
 int sctp_shutdown(struct socket *);
-void sctp_notify 
-(struct sctp_inpcb *, struct ip *ip, struct sctphdr *,
+void 
+sctp_notify(struct sctp_inpcb *, struct ip *ip, struct sctphdr *,
     struct sockaddr *, struct sctp_tcb *,
     struct sctp_nets *);
-
-	int sctp_bindx(struct socket *, int, struct sockaddr_storage *,
-        int, int, struct proc *);
+int 
+sctp_bindx(struct socket *, int, struct sockaddr_storage *,
+    int, int, struct proc *);
 
 /* can't use sctp_assoc_t here */
-	int sctp_peeloff(struct socket *, struct socket *, int, caddr_t, int *);
-
-	int sctp_ingetaddr(struct socket *,
-        struct sockaddr **
-);
-
-	int sctp_peeraddr(struct socket *,
-        struct sockaddr **
-);
-
-	int sctp_listen(struct socket *, int, struct thread *);
-
-	int sctp_accept(struct socket *, struct sockaddr **);
+int sctp_peeloff(struct socket *, struct socket *, int, caddr_t, int *);
+int sctp_ingetaddr(struct socket *, struct sockaddr **);
+int sctp_peeraddr(struct socket *, struct sockaddr **);
+int sctp_listen(struct socket *, int, struct thread *);
+int sctp_accept(struct socket *, struct sockaddr **);
 
 #endif				/* _KERNEL */
 

Modified: head/sys/netinet6/sctp6_var.h
==============================================================================
--- head/sys/netinet6/sctp6_var.h	Mon Oct 29 20:44:29 2012	(r242326)
+++ head/sys/netinet6/sctp6_var.h	Mon Oct 29 20:47:32 2012	(r242327)
@@ -41,21 +41,15 @@ __FBSDID("$FreeBSD$");
 SYSCTL_DECL(_net_inet6_sctp6);
 extern struct pr_usrreqs sctp6_usrreqs;
 
-
 int sctp6_input(struct mbuf **, int *, int);
-int sctp6_output
-(struct sctp_inpcb *, struct mbuf *, struct sockaddr *,
+int 
+sctp6_output(struct sctp_inpcb *, struct mbuf *, struct sockaddr *,
     struct mbuf *, struct proc *);
-	void sctp6_ctlinput(int, struct sockaddr *, void *);
-
-
-	extern void sctp6_notify(struct sctp_inpcb *inp,
-         struct icmp6_hdr *icmph,
-         struct sctphdr *sh,
-         struct sockaddr *to,
-         struct sctp_tcb *stcb,
-         struct sctp_nets *net);
+void sctp6_ctlinput(int, struct sockaddr *, void *);
+extern void 
+sctp6_notify(struct sctp_inpcb *, struct icmp6_hdr *,
+    struct sctphdr *, struct sockaddr *,
+    struct sctp_tcb *, struct sctp_nets *);
 
-
-#endif				/* _KERNEL */
+#endif
 #endif