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 /net/irda | |
| 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 'net/irda')
| -rw-r--r-- | net/irda/iriap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/irda/iriap.c b/net/irda/iriap.c index 254f90746900..2d2e2b1919f4 100644 --- a/net/irda/iriap.c +++ b/net/irda/iriap.c | |||
| @@ -544,7 +544,8 @@ static void iriap_getvaluebyclass_response(struct iriap_cb *self, | |||
| 544 | { | 544 | { |
| 545 | struct sk_buff *tx_skb; | 545 | struct sk_buff *tx_skb; |
| 546 | int n; | 546 | int n; |
| 547 | __u32 tmp_be32, tmp_be16; | 547 | __u32 tmp_be32; |
| 548 | __be16 tmp_be16; | ||
| 548 | __u8 *fp; | 549 | __u8 *fp; |
| 549 | 550 | ||
| 550 | IRDA_DEBUG(4, "%s()\n", __FUNCTION__); | 551 | IRDA_DEBUG(4, "%s()\n", __FUNCTION__); |