Module Name: src
Committed By: riastradh
Date: Wed Jan 20 22:01:18 UTC 2016
Modified Files:
src/sys/netinet: udp_usrreq.c udp_var.h
Log Message:
Give proper prototype to udp_output.
To generate a diff of this commit:
cvs rdiff -u -r1.222 -r1.223 src/sys/netinet/udp_usrreq.c
cvs rdiff -u -r1.40 -r1.41 src/sys/netinet/udp_var.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/udp_usrreq.c
diff -u src/sys/netinet/udp_usrreq.c:1.222 src/sys/netinet/udp_usrreq.c:1.223
--- src/sys/netinet/udp_usrreq.c:1.222 Mon Aug 24 22:21:26 2015
+++ src/sys/netinet/udp_usrreq.c Wed Jan 20 22:01:18 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: udp_usrreq.c,v 1.222 2015/08/24 22:21:26 pooka Exp $ */
+/* $NetBSD: udp_usrreq.c,v 1.223 2016/01/20 22:01:18 riastradh Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.222 2015/08/24 22:21:26 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.223 2016/01/20 22:01:18 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -775,19 +775,14 @@ end:
int
-udp_output(struct mbuf *m, ...)
+udp_output(struct mbuf *m, struct inpcb *inp)
{
- struct inpcb *inp;
struct udpiphdr *ui;
struct route *ro;
int len = m->m_pkthdr.len;
int error = 0;
- va_list ap;
MCLAIM(m, &udp_tx_mowner);
- va_start(ap, m);
- inp = va_arg(ap, struct inpcb *);
- va_end(ap);
/*
* Calculate data length and get a mbuf
Index: src/sys/netinet/udp_var.h
diff -u src/sys/netinet/udp_var.h:1.40 src/sys/netinet/udp_var.h:1.41
--- src/sys/netinet/udp_var.h:1.40 Sun May 18 14:46:16 2014
+++ src/sys/netinet/udp_var.h Wed Jan 20 22:01:18 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: udp_var.h,v 1.40 2014/05/18 14:46:16 rmind Exp $ */
+/* $NetBSD: udp_var.h,v 1.41 2016/01/20 22:01:18 riastradh Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -96,7 +96,7 @@ int udp_ctloutput(int, struct socket *,
void udp_init(void);
void udp_init_common(void);
void udp_input(struct mbuf *, ...);
-int udp_output(struct mbuf *, ...);
+int udp_output(struct mbuf *, struct inpcb *);
int udp_sysctl(int *, u_int, void *, size_t *, void *, size_t);
int udp_input_checksum(int af, struct mbuf *, const struct udphdr *, int,
