Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-block.git] / net / xfrm / xfrm_interface.c

diff --git a/net/xfrm/xfrm_interface.c b/net/xfrm/xfrm_interface.c
index 7dbe0c608df58d609199dc94297f060ce547ec8c..74868f9d81fb2b2c0fdd98522544eabfad3689fe 100644 (file)
--- a/net/xfrm/xfrm_interface.c
+++ b/net/xfrm/xfrm_interface.c
@@ -751,11 +751,6 @@ static void __net_exit xfrmi_destroy_interfaces(struct xfrmi_net *xfrmn)
        unregister_netdevice_many(&list);
 }
 
-static int __net_init xfrmi_init_net(struct net *net)
-{
-       return 0;
-}
-
 static void __net_exit xfrmi_exit_net(struct net *net)
 {
        struct xfrmi_net *xfrmn = net_generic(net, xfrmi_net_id);
@@ -766,7 +761,6 @@ static void __net_exit xfrmi_exit_net(struct net *net)
 }
 
 static struct pernet_operations xfrmi_net_ops = {
-       .init = xfrmi_init_net,
        .exit = xfrmi_exit_net,
        .id   = &xfrmi_net_id,
        .size = sizeof(struct xfrmi_net),