diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-11 13:35:31 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-11 13:35:31 -0500 |
| commit | 749dfc70554f2c9e6624ac843d66571265ed9338 (patch) | |
| tree | bf591255b3f158222f90852d53c4279e6e7e9ced /net/ipv6 | |
| parent | 74f5ec29ae93aa42c49f4285c20c457afe937881 (diff) | |
| parent | 0992a5d029181421877a716eaf99145828ff7eae (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/netfilter/ip6_queue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c index 5027bbe6415e..af0635084df8 100644 --- a/net/ipv6/netfilter/ip6_queue.c +++ b/net/ipv6/netfilter/ip6_queue.c | |||
| @@ -522,7 +522,7 @@ ipq_rcv_skb(struct sk_buff *skb) | |||
| 522 | write_unlock_bh(&queue_lock); | 522 | write_unlock_bh(&queue_lock); |
| 523 | 523 | ||
| 524 | status = ipq_receive_peer(NLMSG_DATA(nlh), type, | 524 | status = ipq_receive_peer(NLMSG_DATA(nlh), type, |
| 525 | skblen - NLMSG_LENGTH(0)); | 525 | nlmsglen - NLMSG_LENGTH(0)); |
| 526 | if (status < 0) | 526 | if (status < 0) |
| 527 | RCV_SKB_FAIL(status); | 527 | RCV_SKB_FAIL(status); |
| 528 | 528 | ||