From 98d481b801c07222a30b62094faa960266fed184 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Wed, 18 Apr 2012 16:11:23 +0000
Subject: [PATCH] --- yaml --- r: 299571 b: refs/heads/master c:
 3adadc08cc1e2cbcc15a640d639297ef5fcb17f5 h: refs/heads/master i:   299569:
 33cce5b84a0916cd8e7a60914081bb0a00abcddc   299567:
 26c83bf3473cb8092f11304c80dc3fd8a948399a v: v3

---
 [refs]                   | 2 +-
 trunk/net/ax25/af_ax25.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e76911cc0bf1..b203ce77a971 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 996f73937cd85031da8dbcd3222a710cb762d428
+refs/heads/master: 3adadc08cc1e2cbcc15a640d639297ef5fcb17f5
diff --git a/trunk/net/ax25/af_ax25.c b/trunk/net/ax25/af_ax25.c
index 0906c194a413..9d9a6a3edbd5 100644
--- a/trunk/net/ax25/af_ax25.c
+++ b/trunk/net/ax25/af_ax25.c
@@ -2011,16 +2011,17 @@ static void __exit ax25_exit(void)
 	proc_net_remove(&init_net, "ax25_route");
 	proc_net_remove(&init_net, "ax25");
 	proc_net_remove(&init_net, "ax25_calls");
-	ax25_rt_free();
-	ax25_uid_free();
-	ax25_dev_free();
 
-	ax25_unregister_sysctl();
 	unregister_netdevice_notifier(&ax25_dev_notifier);
+	ax25_unregister_sysctl();
 
 	dev_remove_pack(&ax25_packet_type);
 
 	sock_unregister(PF_AX25);
 	proto_unregister(&ax25_proto);
+
+	ax25_rt_free();
+	ax25_uid_free();
+	ax25_dev_free();
 }
 module_exit(ax25_exit);