diff options
author | Venkat Yekkirala <vyekkirala@TrustedCS.com> | 2007-01-26 22:03:48 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-01-26 22:03:48 -0500 |
commit | 342a0cff0ad5fba6b591cfa37db3c65c4d9913f8 (patch) | |
tree | d437dd552e615faa7825101197909a8bf515661e /security/selinux/ss | |
parent | c229ec5dae58b218cab0bc1b36a7647b0ec4900f (diff) |
[SELINUX]: Fix 2.6.20-rc6 build when no xfrm
This patch is an incremental fix to the flow_cache_genid
patch for selinux that breaks the build of 2.6.20-rc6 when
xfrm is not configured.
Signed-off-by: Venkat Yekkirala <vyekkirala@TrustedCS.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'security/selinux/ss')
-rw-r--r-- | security/selinux/ss/services.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index ff0393317f39..ca9154dc5d82 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c | |||
@@ -1299,7 +1299,7 @@ int security_load_policy(void *data, size_t len) | |||
1299 | avc_ss_reset(seqno); | 1299 | avc_ss_reset(seqno); |
1300 | selnl_notify_policyload(seqno); | 1300 | selnl_notify_policyload(seqno); |
1301 | selinux_netlbl_cache_invalidate(); | 1301 | selinux_netlbl_cache_invalidate(); |
1302 | atomic_inc(&flow_cache_genid); | 1302 | selinux_xfrm_notify_policyload(); |
1303 | return 0; | 1303 | return 0; |
1304 | } | 1304 | } |
1305 | 1305 | ||
@@ -1355,7 +1355,7 @@ int security_load_policy(void *data, size_t len) | |||
1355 | avc_ss_reset(seqno); | 1355 | avc_ss_reset(seqno); |
1356 | selnl_notify_policyload(seqno); | 1356 | selnl_notify_policyload(seqno); |
1357 | selinux_netlbl_cache_invalidate(); | 1357 | selinux_netlbl_cache_invalidate(); |
1358 | atomic_inc(&flow_cache_genid); | 1358 | selinux_xfrm_notify_policyload(); |
1359 | 1359 | ||
1360 | return 0; | 1360 | return 0; |
1361 | 1361 | ||
@@ -1855,7 +1855,7 @@ out: | |||
1855 | if (!rc) { | 1855 | if (!rc) { |
1856 | avc_ss_reset(seqno); | 1856 | avc_ss_reset(seqno); |
1857 | selnl_notify_policyload(seqno); | 1857 | selnl_notify_policyload(seqno); |
1858 | atomic_inc(&flow_cache_genid); | 1858 | selinux_xfrm_notify_policyload(); |
1859 | } | 1859 | } |
1860 | return rc; | 1860 | return rc; |
1861 | } | 1861 | } |