diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-23 13:40:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-23 13:40:19 -0400 |
| commit | 9cfe864842c755ea6dd683e2449016c7c4ca9867 (patch) | |
| tree | ae5e77ed14f6bd1d04f4e632a62c48e90a17ee40 /include | |
| parent | fd0ff8aa1d95a896b3627bc62d42d6d002ac0bc3 (diff) | |
| parent | f41d5bb1d9f49b03af7126d07a511facbe283a92 (diff) | |
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.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/irda/irlmp.h b/include/net/irda/irlmp.h index 86aefb1fda5e..c0c895d379ba 100644 --- a/include/net/irda/irlmp.h +++ b/include/net/irda/irlmp.h | |||
| @@ -112,7 +112,7 @@ struct lsap_cb { | |||
| 112 | 112 | ||
| 113 | struct timer_list watchdog_timer; | 113 | struct timer_list watchdog_timer; |
| 114 | 114 | ||
| 115 | IRLMP_STATE lsap_state; /* Connection state */ | 115 | LSAP_STATE lsap_state; /* Connection state */ |
| 116 | notify_t notify; /* Indication/Confirm entry points */ | 116 | notify_t notify; /* Indication/Confirm entry points */ |
| 117 | struct qos_info qos; /* QoS for this connection */ | 117 | struct qos_info qos; /* QoS for this connection */ |
| 118 | 118 | ||