From: Florian Westphal Date: Thu, 19 Dec 2013 17:25:15 +0000 (+0100) Subject: netfilter: ctnetlink: honor CTA_MARK_MASK when setting ctmark X-Git-Tag: v3.14-rc1~94^2~284^2~10 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=534473c6080e01395058445135df29a8eb638c77;p=pandora-kernel.git 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 Signed-off-by: Pablo Neira Ayuso --- Reading git-diff-tree failed