projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a42b99a) | patch
netfilter: ctnetlink: honor CTA_MARK_MASK when setting ctmark
authorFlorian Westphal <fw@strlen.de>
Thu, 19 Dec 2013 17:25:15 +0000 (18:25 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Fri, 20 Dec 2013 09:21:42 +0000 (10:21 +0100)
commit534473c6080e01395058445135df29a8eb638c77
tree89dc17bbf0f2601bb7750b5c5efe42c932f39143tree | snapshot (tar.gz zip)
parenta42b99a6e329654d376b330de057eff87686d890commit | diff
netfilter: ctnetlink: honor CTA_MARK_MASK when setting ctmark

Useful to only set a particular range of the conntrack mark while
leaving exisiting parts of the value alone, e.g. when setting
conntrack marks via NFQUEUE.

Follows same scheme as MARK/CONNMARK targets, i.e. the mask defines
those bits that should be altered.  No mask is equal to '~0', ie.
the old value is replaced by new one.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/nf_conntrack_netlink.c diff | blob | blame | history
Motorola kernel-slsi