From 61876dd4a20c4ef07f8220fdac955f440ec2c890 Mon Sep 17 00:00:00 2001
From: Christoph Paasch <christoph.paasch@uclouvain.be>
Date: Thu, 6 Dec 2012 03:03:12 +0000
Subject: [PATCH] --- yaml --- r: 341907 b: refs/heads/master c:
 f5f417c063b83ca3de493e79e7d8c9144d9e7368 h: refs/heads/master i:   341905:
 3aaa3d28faf848c9c80a790df145677a9623c19e   341903:
 db7b87b6b0a695f0b437575a4cc95f461f666581 v: v3

---
 [refs]                    | 2 +-
 trunk/net/sctp/protocol.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1fba04161832..8fbb1802df53 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd3065b25b69ce345073bbd294a73343a608fd8b
+refs/heads/master: f5f417c063b83ca3de493e79e7d8c9144d9e7368
diff --git a/trunk/net/sctp/protocol.c b/trunk/net/sctp/protocol.c
index 456bc3dbdd51..2c7785bacf74 100644
--- a/trunk/net/sctp/protocol.c
+++ b/trunk/net/sctp/protocol.c
@@ -86,7 +86,7 @@ int sysctl_sctp_rmem[3];
 int sysctl_sctp_wmem[3];
 
 /* Set up the proc fs entry for the SCTP protocol. */
-static __net_init int sctp_proc_init(struct net *net)
+static int __net_init sctp_proc_init(struct net *net)
 {
 #ifdef CONFIG_PROC_FS
 	net->sctp.proc_net_sctp = proc_net_mkdir(net, "sctp", net->proc_net);
@@ -1165,7 +1165,7 @@ static void sctp_v4_del_protocol(void)
 	unregister_inetaddr_notifier(&sctp_inetaddr_notifier);
 }
 
-static int sctp_net_init(struct net *net)
+static int __net_init sctp_net_init(struct net *net)
 {
 	int status;
 
@@ -1290,7 +1290,7 @@ static int sctp_net_init(struct net *net)
 	return status;
 }
 
-static void sctp_net_exit(struct net *net)
+static void __net_exit sctp_net_exit(struct net *net)
 {
 	/* Free the local address list */
 	sctp_free_addr_wq(net);