Module Name: src
Committed By: rmind
Date: Fri May 23 19:35:24 UTC 2014
Modified Files:
src/sys/netinet: ip_input.c ip_var.h
Log Message:
Make ip_forward() static, there is no need to expose it.
To generate a diff of this commit:
cvs rdiff -u -r1.312 -r1.313 src/sys/netinet/ip_input.c
cvs rdiff -u -r1.102 -r1.103 src/sys/netinet/ip_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/ip_input.c
diff -u src/sys/netinet/ip_input.c:1.312 src/sys/netinet/ip_input.c:1.313
--- src/sys/netinet/ip_input.c:1.312 Fri May 23 19:27:48 2014
+++ src/sys/netinet/ip_input.c Fri May 23 19:35:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_input.c,v 1.312 2014/05/23 19:27:48 rmind Exp $ */
+/* $NetBSD: ip_input.c,v 1.313 2014/05/23 19:35:24 rmind Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.312 2014/05/23 19:27:48 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.313 2014/05/23 19:35:24 rmind Exp $");
#include "opt_inet.h"
#include "opt_compat_netbsd.h"
@@ -272,6 +272,7 @@ struct mowner ip_tx_mowner = MOWNER_INIT
#endif
static void ip_input(struct mbuf *);
+static void ip_forward(struct mbuf *, int);
static bool ip_dooptions(struct mbuf *);
static struct in_ifaddr *ip_rtaddr(struct in_addr);
static void sysctl_net_inet_ip_setup(struct sysctllog **);
@@ -1167,7 +1168,7 @@ ip_drainstub(void)
* The srcrt parameter indicates whether the packet is being forwarded
* via a source route.
*/
-void
+static void
ip_forward(struct mbuf *m, int srcrt)
{
struct ip *ip = mtod(m, struct ip *);
Index: src/sys/netinet/ip_var.h
diff -u src/sys/netinet/ip_var.h:1.102 src/sys/netinet/ip_var.h:1.103
--- src/sys/netinet/ip_var.h:1.102 Thu May 22 23:42:53 2014
+++ src/sys/netinet/ip_var.h Fri May 23 19:35:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_var.h,v 1.102 2014/05/22 23:42:53 rmind Exp $ */
+/* $NetBSD: ip_var.h,v 1.103 2014/05/23 19:35:24 rmind Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -201,7 +201,6 @@ void in_init(void);
int ip_ctloutput(int, struct socket *, struct sockopt *);
void ip_drain(void);
void ip_drainstub(void);
-void ip_forward(struct mbuf *, int);
void ip_freemoptions(struct ip_moptions *);
int ip_optcopy(struct ip *, struct ip *);
u_int ip_optlen(struct inpcb *);
