svn commit: r237900 - stable/9/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Sun Jul  1 08:09:05 2012
New Revision: 237900
URL: http://svn.freebsd.org/changeset/base/237900

Log:
  MFC r236450:
  Remove an unused parameter.

Modified:
  stable/9/sys/netinet/sctp_input.c
  stable/9/sys/netinet/sctputil.c
  stable/9/sys/netinet/sctputil.h
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netinet/sctp_input.c
==============================================================================
--- stable/9/sys/netinet/sctp_input.c	Sun Jul  1 08:06:43 2012	(r237899)
+++ stable/9/sys/netinet/sctp_input.c	Sun Jul  1 08:09:05 2012	(r237900)
@@ -4516,7 +4516,7 @@ __attribute__((noinline))
 		}
 		if (stcb == NULL) {
 			/* no association, so it's out of the blue... */
-			sctp_handle_ootb(m, iphlen, *offset, sh, inp, NULL,
+			sctp_handle_ootb(m, iphlen, *offset, sh, inp,
 			    vrf_id, port);
 			*offset = length;
 			if (locked_tcb) {
@@ -4554,7 +4554,7 @@ __attribute__((noinline))
 					SCTP_TCB_UNLOCK(locked_tcb);
 				}
 				sctp_handle_ootb(m, iphlen, *offset, sh, inp,
-				    NULL, vrf_id, port);
+				    vrf_id, port);
 				return (NULL);
 			}
 		} else {
@@ -5586,7 +5586,7 @@ sctp_common_input_processing(struct mbuf
 			 * NOT respond to any packet.. its OOTB.
 			 */
 			SCTP_TCB_UNLOCK(stcb);
-			sctp_handle_ootb(m, iphlen, offset, sh, inp, NULL,
+			sctp_handle_ootb(m, iphlen, offset, sh, inp,
 			    vrf_id, port);
 			goto out_now;
 		}
@@ -5630,7 +5630,7 @@ sctp_common_input_processing(struct mbuf
 		}
 		if (stcb == NULL) {
 			/* out of the blue DATA chunk */
-			sctp_handle_ootb(m, iphlen, offset, sh, inp, NULL,
+			sctp_handle_ootb(m, iphlen, offset, sh, inp,
 			    vrf_id, port);
 			goto out_now;
 		}
@@ -5699,7 +5699,7 @@ sctp_common_input_processing(struct mbuf
 			/*
 			 * We consider OOTB any data sent during asoc setup.
 			 */
-			sctp_handle_ootb(m, iphlen, offset, sh, inp, NULL,
+			sctp_handle_ootb(m, iphlen, offset, sh, inp,
 			    vrf_id, port);
 			SCTP_TCB_UNLOCK(stcb);
 			goto out_now;

Modified: stable/9/sys/netinet/sctputil.c
==============================================================================
--- stable/9/sys/netinet/sctputil.c	Sun Jul  1 08:06:43 2012	(r237899)
+++ stable/9/sys/netinet/sctputil.c	Sun Jul  1 08:09:05 2012	(r237900)
@@ -3994,7 +3994,7 @@ sctp_abort_an_association(struct sctp_in
 
 void
 sctp_handle_ootb(struct mbuf *m, int iphlen, int offset, struct sctphdr *sh,
-    struct sctp_inpcb *inp, struct mbuf *op_err, uint32_t vrf_id, uint16_t port)
+    struct sctp_inpcb *inp, uint32_t vrf_id, uint16_t port)
 {
 	struct sctp_chunkhdr *ch, chunk_buf;
 	unsigned int chk_length;
@@ -4049,7 +4049,7 @@ sctp_handle_ootb(struct mbuf *m, int iph
 	if ((SCTP_BASE_SYSCTL(sctp_blackhole) == 0) ||
 	    ((SCTP_BASE_SYSCTL(sctp_blackhole) == 1) &&
 	    (contains_init_chunk == 0))) {
-		sctp_send_abort(m, iphlen, sh, 0, op_err, vrf_id, port);
+		sctp_send_abort(m, iphlen, sh, 0, NULL, vrf_id, port);
 	}
 }
 

Modified: stable/9/sys/netinet/sctputil.h
==============================================================================
--- stable/9/sys/netinet/sctputil.h	Sun Jul  1 08:06:43 2012	(r237899)
+++ stable/9/sys/netinet/sctputil.h	Sun Jul  1 08:09:05 2012	(r237900)
@@ -200,7 +200,7 @@ sctp_abort_an_association(struct sctp_in
 
 void 
 sctp_handle_ootb(struct mbuf *, int, int, struct sctphdr *,
-    struct sctp_inpcb *, struct mbuf *, uint32_t, uint16_t);
+    struct sctp_inpcb *, uint32_t, uint16_t);
 
 int 
 sctp_connectx_helper_add(struct sctp_tcb *stcb, struct sockaddr *addr,