merge 5.9p1

1 files changed, 1 insertions, 2 deletions

diff --git a/packet.h b/packet.h
index d516aae8d..90eec17a9 100644
--- a/packet.h
+++ b/packet.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.h,v 1.55 2010/11/13 23:27:50 djm Exp $ */
+/* $OpenBSD: packet.h,v 1.56 2011/05/06 21:14:05 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -92,7 +92,6 @@ int      packet_have_data_to_write(void);
 int      packet_not_very_much_data_to_write(void);
 
 int      packet_connection_is_on_socket(void);
-int      packet_connection_is_ipv4(void);
 int      packet_remaining(void);
 void     packet_send_ignore(int);
 void     packet_add_padding(u_char);