]> git.karo-electronics.de Git - mv-sheeva.git/commit
projects / mv-sheeva.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 845ca30) | patch
secmark: fix config problem when CONFIG_NF_CONNTRACK_SECMARK is not set
authorEric Paris <eparis@redhat.com>
Tue, 19 Oct 2010 22:17:32 +0000 (18:17 -0400)
committerJames Morris <jmorris@namei.org>
Wed, 20 Oct 2010 23:13:00 +0000 (10:13 +1100)
commitff660c80d00b52287f1f67ee6c115dc0057bcdde
tree63a0e4c69b9d78b5b81156029d5599dc2f3bf0a4tree | snapshot
parent845ca30fe9691f1bab7cfbf30b6d11c944eb4abdcommit | diff
secmark: fix config problem when CONFIG_NF_CONNTRACK_SECMARK is not set

When CONFIG_NF_CONNTRACK_SECMARK is not set we accidentally attempt to use
the secmark fielf of struct nf_conn.  Problem is when that config isn't set
the field doesn't exist.  whoops.  Wrap the incorrect usage in the config.

Signed-off-by: Eric Paris <eparis@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
net/netfilter/nf_conntrack_netlink.c diff | blob | history
Linux for Marvell Sheeva based platforms