Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next

Per pull request, for 3.5.

1 files changed, 2 insertions, 4 deletions

diff --git a/security/selinux/netif.c b/security/selinux/netif.c
index 326f22cbe405..47a49d1a6f6a 100644
--- a/security/selinux/netif.c
+++ b/security/selinux/netif.c
@@ -252,8 +252,7 @@ static void sel_netif_flush(void)
         spin_unlock_bh(&sel_netif_lock);
 }
 
-static int sel_netif_avc_callback(u32 event, u32 ssid, u32 tsid,
-                                  u16 class, u32 perms, u32 *retained)
+static int sel_netif_avc_callback(u32 event)
 {
         if (event == AVC_CALLBACK_RESET) {
                 sel_netif_flush();
@@ -292,8 +291,7 @@ 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,
-                               SECSID_NULL, SECSID_NULL, SECCLASS_NULL, 0);
+        err = avc_add_callback(sel_netif_avc_callback, AVC_CALLBACK_RESET);
         if (err)
                 panic("avc_add_callback() failed, error %d\n", err);