Pass me the pointy hat.

It was not a good idea to remove csu_header from struct cspace, it had
ramifications which I didn't notice.

Restore src/usr.sbin/ppp/slcompress.h to the way it was, since MAX_HDR
was already defined as 128 there and it's a user program anyway.

In sys/net/slcompress.h make MAX_HDR 128 intead of MLEN to avoid
bloat.

My apologies for any inconvenience.

1 files changed, 8 insertions, 2 deletions

diff --git a/usr.sbin/ppp/slcompress.h b/usr.sbin/ppp/slcompress.h
index 85aee7432f95..099771be134f 100644
--- a/usr.sbin/ppp/slcompress.h
+++ b/usr.sbin/ppp/slcompress.h
@@ -102,8 +102,14 @@ struct cstate {
   u_short cs_hlen;		/* size of hdr (receive only) */
   u_char cs_id;			/* connection # associated with this state */
   u_char cs_filler;
-  struct ip cs_ip;		/* ip/tcp hdr from most recent packet */
-};
+  union {
+    char csu_hdr[MAX_HDR];
+    struct ip csu_ip;		/* ip/tcp hdr from most recent packet */
+  } slcs_u;
+ };
+
+#define cs_ip slcs_u.csu_ip
+#define cs_hdr slcs_u.csu_hdr
 
 /*
  * all the state data for one serial line (we need one of these