From 5a14eb4b693ec08a0167c3ff58826f59c0584839 Mon Sep 17 00:00:00 2001
From: mpi <mpi@openbsd.org>
Date: Tue, 12 Aug 2014 13:52:08 +0000
Subject: [PATCH] route_cb is internal to rtsock.c

---
 sys/net/route.c  |  3 +--
 sys/net/route.h  | 10 +---------
 sys/net/rtsock.c | 11 ++++++++++-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sys/net/route.c b/sys/net/route.c
index 4ff77ef9ab8..c20fed753cc 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.c,v 1.176 2014/08/11 11:59:05 mpi Exp $	*/
+/*	$OpenBSD: route.c,v 1.177 2014/08/12 13:52:08 mpi Exp $	*/
 /*	$NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $	*/
 
 /*
@@ -132,7 +132,6 @@
 struct ifaddr	*encap_findgwifa(struct sockaddr *, u_int);
 #endif
 
-struct	route_cb	   route_cb;
 struct	rtstat		   rtstat;
 struct	radix_node_head	***rt_tables;
 u_int8_t		   af2rtafidx[AF_MAX+1];
diff --git a/sys/net/route.h b/sys/net/route.h
index 94299336e5f..f610a1618da 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.h,v 1.95 2014/07/29 12:18:41 mpi Exp $	*/
+/*	$OpenBSD: route.h,v 1.96 2014/08/12 13:52:08 mpi Exp $	*/
 /*	$NetBSD: route.h,v 1.9 1996/02/13 22:00:49 christos Exp $	*/
 
 /*
@@ -343,14 +343,6 @@ void		 rtlabel_unref(u_int16_t);
 #define	RT_REPORT	0x1
 #define	RT_NOCLONING	0x2
 
-struct route_cb {
-	int	ip_count;
-	int	ip6_count;
-	int     mpls_count;
-	int	any_count;
-};
-
-extern struct route_cb route_cb;
 extern struct rtstat rtstat;
 extern const struct sockaddr_rtin rt_defmask4;
 
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 943ad8a8261..75c65362cf4 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtsock.c,v 1.151 2014/08/11 11:59:05 mpi Exp $	*/
+/*	$OpenBSD: rtsock.c,v 1.152 2014/08/12 13:52:08 mpi Exp $	*/
 /*	$NetBSD: rtsock.c,v 1.18 1996/03/29 00:32:10 cgd Exp $	*/
 
 /*
@@ -109,6 +109,15 @@ struct routecb {
 };
 #define	sotoroutecb(so)	((struct routecb *)(so)->so_pcb)
 
+struct route_cb {
+	int		ip_count;
+	int		ip6_count;
+	int		mpls_count;
+	int		any_count;
+};
+
+struct route_cb route_cb;
+
 /*
  * These flags and timeout are used for indicating to userland (via a 
  * RTM_DESYNC msg) when the route socket has overflowed and messages 
-- 
2.20.1