diff options
author | David S. Miller <davem@davemloft.net> | 2012-08-31 17:06:37 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-08-31 17:06:37 (GMT) |
commit | 0dcd5052c8543ef999bcd252cee50b7ae8111e89 (patch) | |
tree | 1b10a35334ec660f8fe021ce9cdeb08bb65fc839 /net/netfilter/nfnetlink_log.c | |
parent | 14a15d618743ebc4936fe03073bf0c75024d3a07 (diff) | |
parent | 5b423f6a40a0327f9d40bc8b97ce9be266f74368 (diff) | |
download | linux-fsl-qoriq-0dcd5052c8543ef999bcd252cee50b7ae8111e89.tar.xz |
Merge branch 'master' of git://1984.lsi.us.es/nf
Diffstat (limited to 'net/netfilter/nfnetlink_log.c')
-rw-r--r-- | net/netfilter/nfnetlink_log.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c index 169ab59..14e2f39 100644 --- a/net/netfilter/nfnetlink_log.c +++ b/net/netfilter/nfnetlink_log.c @@ -480,7 +480,7 @@ __build_packet_message(struct nfulnl_instance *inst, } if (indev && skb_mac_header_was_set(skb)) { - if (nla_put_be32(inst->skb, NFULA_HWTYPE, htons(skb->dev->type)) || + if (nla_put_be16(inst->skb, NFULA_HWTYPE, htons(skb->dev->type)) || nla_put_be16(inst->skb, NFULA_HWLEN, htons(skb->dev->hard_header_len)) || nla_put(inst->skb, NFULA_HWHEADER, skb->dev->hard_header_len, @@ -996,8 +996,10 @@ static int __init nfnetlink_log_init(void) #ifdef CONFIG_PROC_FS if (!proc_create("nfnetlink_log", 0440, - proc_net_netfilter, &nful_file_ops)) + proc_net_netfilter, &nful_file_ops)) { + status = -ENOMEM; goto cleanup_logger; + } #endif return status; |