summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-05-23 10:40:19 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-23 10:40:19 -0700
commit9cfe864842c755ea6dd683e2449016c7c4ca9867 (patch)
treeae5e77ed14f6bd1d04f4e632a62c48e90a17ee40 /include
parentfd0ff8aa1d95a896b3627bc62d42d6d002ac0bc3 (diff)
parentf41d5bb1d9f49b03af7126d07a511facbe283a92 (diff)
downloadop-kernel-dev-9cfe864842c755ea6dd683e2449016c7c4ca9867.zip
op-kernel-dev-9cfe864842c755ea6dd683e2449016c7c4ca9867.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [NETFILTER]: SNMP NAT: fix memory corruption [IRDA]: fixup type of ->lsap_state [IRDA]: fix 16/32 bit confusion [NET]: Fix "ntohl(ntohs" bugs [BNX2]: Use kmalloc instead of array [BNX2]: Fix bug in bnx2_nvram_write() [TG3]: Add some missing rx error counters
Diffstat (limited to 'include')
-rw-r--r--include/net/irda/irlmp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/irda/irlmp.h b/include/net/irda/irlmp.h
index 86aefb1..c0c895d 100644
--- a/include/net/irda/irlmp.h
+++ b/include/net/irda/irlmp.h
@@ -112,7 +112,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 */
OpenPOWER on IntegriCloud