ISDN/PPP: Move CCP related stuff into isdn_ppp_ccp.c

Create the new files isdn_ppp_ccp.[hc] which deal with PPP CCP
(compression control protocol) related stuff. Move most of the CCP
related stuff from isdn_ppp.c into isdn_ppp_ccp.c, putting CCP
state into a new "struct ippp_ccp".

2 files changed, 6 insertions, 24 deletions

diff --git a/include/linux/isdn.h b/include/linux/isdn.h
index fcabee098ab1..64c9c128f46d 100644
--- a/include/linux/isdn.h
+++ b/include/linux/isdn.h
@@ -359,14 +359,7 @@ typedef struct isdn_net_local_s {
 #ifdef CONFIG_ISDN_PPP
   unsigned int           mpppcfg;
   long                   mp_seqno;
-
-  struct isdn_ppp_compressor *compressor;
-  struct isdn_ppp_compressor *decompressor;
-  void                  *comp_stat;
-  void                  *decomp_stat;
-  unsigned long          compflags;
-  struct ippp_ccp_reset *reset;
-
+  struct ippp_ccp        *ccp;
   unsigned long          debug;
 #ifdef CONFIG_ISDN_PPP_VJ
   unsigned char         *cbuf;
@@ -434,15 +427,8 @@ typedef struct isdn_net_dev_s {
   struct list_head       global_list;  /* global list of all isdn_net_devs */
 #ifdef CONFIG_ISDN_PPP
   unsigned int           pppcfg;
-  unsigned int           pppmru;
   unsigned int           pppseq;       /* last seq no seen                 */
-
-  struct isdn_ppp_compressor *compressor;
-  struct isdn_ppp_compressor *decompressor;
-  void                  *comp_stat;
-  void                  *decomp_stat;
-  unsigned long          compflags;
-  struct ippp_ccp_reset *reset;
+  struct ippp_ccp        *ccp;
   unsigned long          debug;
 
   ippp_bundle * pb;		/* pointer to the common bundle structure
diff --git a/include/linux/isdn_ppp.h b/include/linux/isdn_ppp.h
index 42418a8aaf08..2c1fc99849f2 100644
--- a/include/linux/isdn_ppp.h
+++ b/include/linux/isdn_ppp.h
@@ -8,7 +8,6 @@
 #ifndef _LINUX_ISDN_PPP_H
 #define _LINUX_ISDN_PPP_H
 
-
 #define CALLTYPE_INCOMING 0x1
 #define CALLTYPE_OUTGOING 0x2
 #define CALLTYPE_CALLBACK 0x4
@@ -64,7 +63,8 @@ struct isdn_ppp_comp_data {
 
 
 #include <linux/config.h>
-
+#include <linux/skbuff.h>
+#include <linux/ppp_defs.h>
 
 #define DECOMP_ERR_NOMEM	(-10)
 
@@ -172,8 +172,8 @@ enum ippp_ccp_reset_states {
 
 struct ippp_ccp_reset_state {
   enum ippp_ccp_reset_states state;	/* State of this transaction */
-  struct ippp_ccp_reset *icr;           /* Backlink */
-  unsigned char id;			/* Backlink id index */
+  struct ippp_ccp *ccp;                 /* Backlink */
+  unsigned char id;			/* id index */
   unsigned char ta:1;			/* The timer is active (flag) */
   unsigned char expra:1;		/* We expect a ResetAck at all */
   int dlen;				/* Databytes stored in data */
@@ -189,10 +189,6 @@ struct ippp_ccp_reset_state {
 struct ippp_ccp_reset {
   struct ippp_ccp_reset_state *rs[256];	/* One per possible id */
   unsigned char lastid;			/* Last id allocated by the engine */
-  void (*xmit_reset)(void *priv, int proto, unsigned char code,
-		     unsigned char id, unsigned char *data, int len);
-  void (*kick_up)(void *priv);
-  void *priv;
 };
 
 #endif /* __KERNEL__ */