X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fnet%2Firda%2Firlmp.h;fp=include%2Fnet%2Firda%2Firlmp.h;h=e212b9bc2503d64439cd70c3ffa4d080d15751dd;hb=97bf2856c6014879bd04983a3e9dfcdac1e7fe85;hp=86aefb1fda5e0bba0f24210eb9864b63801fe913;hpb=76828883507a47dae78837ab5dec5a5b4513c667;p=linux-2.6.git

diff --git a/include/net/irda/irlmp.h b/include/net/irda/irlmp.h
index 86aefb1fd..e212b9bc2 100644
--- a/include/net/irda/irlmp.h
+++ b/include/net/irda/irlmp.h
@@ -29,7 +29,6 @@
 
 #include <asm/param.h>  /* for HZ */
 
-#include <linux/config.h>
 #include <linux/types.h>
 
 #include <net/irda/irda.h>
@@ -49,7 +48,7 @@
 #define DEV_ADDR_ANY  0xffffffff
 
 #define LMP_HEADER          2    /* Dest LSAP + Source LSAP */
-#define LMP_CONTROL_HEADER  4
+#define LMP_CONTROL_HEADER  4    /* LMP_HEADER + opcode + parameter */
 #define LMP_PID_HEADER      1    /* Used by Ultra */
 #define LMP_MAX_HEADER      (LMP_CONTROL_HEADER+LAP_MAX_HEADER)
 
@@ -112,7 +111,7 @@ struct lsap_cb {
 
 	struct timer_list watchdog_timer;
 
-	IRLMP_STATE     lsap_state;  /* Connection state */
+	LSAP_STATE      lsap_state;  /* Connection state */
 	notify_t        notify;      /* Indication/Confirm entry points */
 	struct qos_info qos;         /* QoS for this connection */