diff options
author | David S. Miller <davem@davemloft.net> | 2009-05-27 15:51:25 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-05-27 15:51:25 -0700 |
commit | 4d3383d0adb6d1047fb9ee3edd9dc05e4d2184f0 (patch) | |
tree | b9eabfb61d9b74d87e75c073c79edc92d9612ed8 /net/netfilter/nfnetlink_log.c | |
parent | b63dc8fef7ca5c51d163295d824e78c770d48ccf (diff) | |
parent | eeff9beec3d2563c42cca41e66d4169592bb5475 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'net/netfilter/nfnetlink_log.c')
-rw-r--r-- | net/netfilter/nfnetlink_log.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c index fd326ac27ec8..66a6dd5c519a 100644 --- a/net/netfilter/nfnetlink_log.c +++ b/net/netfilter/nfnetlink_log.c @@ -581,6 +581,12 @@ nfulnl_log_packet(u_int8_t pf, + nla_total_size(sizeof(struct nfulnl_msg_packet_hw)) + nla_total_size(sizeof(struct nfulnl_msg_packet_timestamp)); + if (in && skb_mac_header_was_set(skb)) { + size += nla_total_size(skb->dev->hard_header_len) + + nla_total_size(sizeof(u_int16_t)) /* hwtype */ + + nla_total_size(sizeof(u_int16_t)); /* hwlen */ + } + spin_lock_bh(&inst->lock); if (inst->flags & NFULNL_CFG_F_SEQ) |