summaryrefslogtreecommitdiff
path: root/security/selinux/netif.c
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2014-07-19 11:39:19 +0400
committerJames Morris <james.l.morris@oracle.com>2014-07-19 11:39:19 +0400
commit2ccf4661f315615d018686d91d030a94001d0cc6 (patch)
treef5374b5233ba5c43a4710bc8cbc5319091da044e /security/selinux/netif.c
parent32c2e6752ff0f48fe03b9e1c7c64bde580a840d2 (diff)
parent615e51fdda6f274e94b1e905fcaf6111e0d9aa20 (diff)
downloadlinux-2ccf4661f315615d018686d91d030a94001d0cc6.tar.xz
Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'security/selinux/netif.c')
-rw-r--r--security/selinux/netif.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/security/selinux/netif.c b/security/selinux/netif.c
index 694e9e43855f..3c3de4ca0ebc 100644
--- a/security/selinux/netif.c
+++ b/security/selinux/netif.c
@@ -240,7 +240,7 @@ static void sel_netif_kill(int ifindex)
* Remove all entries from the network interface table.
*
*/
-static void sel_netif_flush(void)
+void sel_netif_flush(void)
{
int idx;
struct sel_netif *netif;
@@ -252,15 +252,6 @@ static void sel_netif_flush(void)
spin_unlock_bh(&sel_netif_lock);
}
-static int sel_netif_avc_callback(u32 event)
-{
- if (event == AVC_CALLBACK_RESET) {
- sel_netif_flush();
- synchronize_net();
- }
- return 0;
-}
-
static int sel_netif_netdev_notifier_handler(struct notifier_block *this,
unsigned long event, void *ptr)
{
@@ -291,10 +282,6 @@ static __init int sel_netif_init(void)
register_netdevice_notifier(&sel_netif_netdev_notifier);
- err = avc_add_callback(sel_netif_avc_callback, AVC_CALLBACK_RESET);
- if (err)
- panic("avc_add_callback() failed, error %d\n", err);
-
return err;
}