git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
net
/
irda
/
irlmp.h
diff --git
a/include/net/irda/irlmp.h
b/include/net/irda/irlmp.h
index
86aefb1
..
e212b9b
100644
(file)
--- a/
include/net/irda/irlmp.h
+++ b/
include/net/irda/irlmp.h
@@
-29,7
+29,6
@@
#include <asm/param.h> /* for HZ */
#include <asm/param.h> /* for HZ */
-#include <linux/config.h>
#include <linux/types.h>
#include <net/irda/irda.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 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)
#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;
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 */
notify_t notify; /* Indication/Confirm entry points */
struct qos_info qos; /* QoS for this connection */