From 881048943390d6e5a88cc0c5fb88da73dfb688cc Mon Sep 17 00:00:00 2001
From: Gary Jennejohn <gj@FreeBSD.org>
Date: Mon, 3 Apr 2000 19:54:33 +0000
Subject: [PATCH] Nuke csu_hdr from struct cspace. csu_hdr is not used anywhere
 in the tree. This considerably reduces unnecessary bloat in struct
 slcompress.

I'm running with this change right now and have seen no negative
side-effects.

On my sytem this reduced kernel BSS by about 25KB.

Submitted by:	bde
Approved by:	brian for user-ppp
---
 sys/net/slcompress.h      | 9 ++-------
 usr.sbin/ppp/slcompress.h | 8 +-------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/sys/net/slcompress.h b/sys/net/slcompress.h
index ca7ed031ccfc..4e20c3768c40 100644
--- a/sys/net/slcompress.h
+++ b/sys/net/slcompress.h
@@ -41,7 +41,7 @@
 #define _NET_SLCOMPRESS_H_
 
 #define MAX_STATES 16		/* must be > 2 and < 256 */
-#define MAX_HDR MLEN		/* XXX 4bsd-ism: should really be 128 */
+#define MAX_HDR 128
 
 /*
  * Compressed packet format:
@@ -119,13 +119,8 @@ struct cstate {
 	u_int16_t cs_hlen;	/* size of hdr (receive only) */
 	u_char cs_id;		/* connection # associated with this state */
 	u_char cs_filler;
-	union {
-		char csu_hdr[MAX_HDR];
-		struct ip csu_ip;	/* ip/tcp hdr from most recent packet */
-	} slcs_u;
+	struct ip cs_ip;	/* ip/tcp hdr from most recent packet */
 };
-#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
diff --git a/usr.sbin/ppp/slcompress.h b/usr.sbin/ppp/slcompress.h
index 223f65948b4e..85aee7432f95 100644
--- a/usr.sbin/ppp/slcompress.h
+++ b/usr.sbin/ppp/slcompress.h
@@ -102,15 +102,9 @@ struct cstate {
   u_short cs_hlen;		/* size of hdr (receive only) */
   u_char cs_id;			/* connection # associated with this state */
   u_char cs_filler;
-  union {
-    char csu_hdr[MAX_HDR];
-    struct ip csu_ip;		/* ip/tcp hdr from most recent packet */
-  } slcs_u;
+  struct ip cs_ip;		/* ip/tcp hdr from most recent packet */
 };
 
-#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
  * per line).