patch-2.4.7 linux/include/net/irda/irlap.h

• Lines: 55
• Date: Wed Jul 4 11:50:38 2001
• Orig file: v2.4.6/linux/include/net/irda/irlap.h
• Orig date: Fri May 25 17:07:20 2001

diff -u --recursive --new-file v2.4.6/linux/include/net/irda/irlap.h linux/include/net/irda/irlap.h
@@ -43,15 +43,8 @@
 
 #define LAP_ADDR_HEADER 1  /* IrLAP Address Header */
 #define LAP_CTRL_HEADER 1  /* IrLAP Control Header */
-#define LAP_COMP_HEADER 1  /* IrLAP Compression Header */
 
-#ifdef CONFIG_IRDA_COMPRESSION
-#  define LAP_MAX_HEADER  (LAP_ADDR_HEADER + LAP_CTRL_HEADER + LAP_COMP_HEADER)
-#  define IRDA_COMPRESSED 1
-#  define IRDA_NORMAL     0
-#else
 #define LAP_MAX_HEADER (LAP_ADDR_HEADER + LAP_CTRL_HEADER)
-#endif
 
 #define BROADCAST  0xffffffff /* Broadcast device address */
 #define CBROADCAST 0xfe       /* Connection broadcast address */
@@ -68,26 +61,6 @@
 #define NS_UNEXPECTED   0
 #define NS_INVALID     -1
 
-#ifdef CONFIG_IRDA_COMPRESSION
-
-/*  
- *  Just some shortcuts (may give you strange compiler errors if you change 
- *  them :-)
- */
-#define irda_compress    (*self->compessor.cp->compress)
-#define irda_comp_free   (*self->compressor.cp->comp_free)
-#define irda_decompress  (*self->decompressor.cp->decompress)
-#define irda_decomp_free (*self->decompressor.cp->decomp_free)
-#define irda_incomp      (*self->decompressor.cp->incomp)
-
-struct irda_compressor {
-	irda_queue_t q;
-
-	struct compressor *cp;
-	void *state; /* Not used by IrDA */
-};
-#endif
-
 /* Main structure of IrLAP */
 struct irlap_cb {
 	irda_queue_t q;     /* Must be first */
@@ -180,11 +153,6 @@
 	int    xbofs_delay;   /* Nr of XBOF's used to MTT */
 	int    bofs_count;    /* Negotiated extra BOFs */
 	int    next_bofs;     /* Negotiated extra BOFs after next frame */
-
-#ifdef CONFIG_IRDA_COMPRESSION
-	struct irda_compressor compressor;
-        struct irda_compressor decompressor;
-#endif /* CONFIG_IRDA_COMPRESSION */
 };
 
 extern hashbin_t *irlap;