git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fae6ef8)
netfilter: nfnetlink_log: fix NLA_PUT macro removal bug
authorPatrick McHardy <kaber@trash.net>
Sun, 19 Aug 2012 10:16:08 +0000 (10:16 +0000)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 20 Aug 2012 10:40:23 +0000 (12:40 +0200)
Commit 1db20a52 (nfnetlink_log: Stop using NLA_PUT*().) incorrectly
converted a NLA_PUT_BE16 macro to nla_put_be32() in nfnetlink_log:

-               NLA_PUT_BE16(inst->skb, NFULA_HWTYPE, htons(skb->dev->type));
+               if (nla_put_be32(inst->skb, NFULA_HWTYPE, htons(skb->dev->type))

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/nfnetlink_log.c patch | blob | history

diff --cc net/netfilter/nfnetlink_log.c
Simple merge
Pandora Kernel Repository