1 files changed, 12 insertions, 3 deletions

diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index 1d50f801f181..43bbe2c9e49a 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -1377,6 +1377,15 @@ static struct notifier_block nr_dev_notifier = {
 
 static struct net_device **dev_nr;
 
+static struct ax25_protocol nr_pid = {
+        .pid    = AX25_P_NETROM,
+        .func   = nr_route_frame
+};
+
+static struct ax25_linkfail nr_linkfail_notifier = {
+        .func   = nr_link_failed,
+};
+
 static int __init nr_proto_init(void)
 {
         int i;
@@ -1424,8 +1433,8 @@ static int __init nr_proto_init(void)
                 
         register_netdevice_notifier(&nr_dev_notifier);
 
-        ax25_protocol_register(AX25_P_NETROM, nr_route_frame);
-        ax25_linkfail_register(nr_link_failed);
+        ax25_register_pid(&nr_pid);
+        ax25_linkfail_register(&nr_linkfail_notifier);
 
 #ifdef CONFIG_SYSCTL
         nr_register_sysctl();
@@ -1474,7 +1483,7 @@ static void __exit nr_exit(void)
         nr_unregister_sysctl();
 #endif
 
-        ax25_linkfail_release(nr_link_failed);
+        ax25_linkfail_release(&nr_linkfail_notifier);
         ax25_protocol_release(AX25_P_NETROM);
 
         unregister_netdevice_notifier(&nr_dev_notifier);