summaryrefslogtreecommitdiff
path: root/packet.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2012-05-17 13:04:02 +0100
committerColin Watson <cjwatson@debian.org>2012-05-17 13:04:02 +0100
commitdd5ed53e20d218607260916a6b04d1c8c5b3d88f (patch)
treec59b4dbcc610f10700945f885adf3bddc2542c26 /packet.h
parent8241a65bf12ac53c1b7304bba7ce739aad80b8b8 (diff)
parentb9bc38990c5eb5d99e28ca5af6d3491fd4a0060a (diff)
merge 6.0p1
Diffstat (limited to 'packet.h')
-rw-r--r--packet.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/packet.h b/packet.h
index 90eec17a9..09ba07951 100644
--- a/packet.h
+++ b/packet.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: packet.h,v 1.56 2011/05/06 21:14:05 djm Exp $ */ 1/* $OpenBSD: packet.h,v 1.57 2012/01/25 19:40:09 markus Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -55,7 +55,6 @@ void packet_send(void);
55 55
56int packet_read(void); 56int packet_read(void);
57void packet_read_expect(int type); 57void packet_read_expect(int type);
58int packet_read_poll(void);
59void packet_process_incoming(const char *buf, u_int len); 58void packet_process_incoming(const char *buf, u_int len);
60int packet_read_seqnr(u_int32_t *seqnr_p); 59int packet_read_seqnr(u_int32_t *seqnr_p);
61int packet_read_poll_seqnr(u_int32_t *seqnr_p); 60int packet_read_poll_seqnr(u_int32_t *seqnr_p);