4 files changed, 32 insertions, 32 deletions

diff --git a/include/net/ax25.h b/include/net/ax25.h
index ced202f0729b..51060ef74590 100644
--- a/include/net/ax25.h
+++ b/include/net/ax25.h
@@ -333,7 +333,14 @@ extern void ax25_ds_t3timer_expiry(ax25_cb *);
 extern void ax25_ds_idletimer_expiry(ax25_cb *);
 
 /* ax25_iface.c */
-extern int __must_check ax25_protocol_register(unsigned int, int (*)(struct sk_buff *, ax25_cb *));
+
+struct ax25_protocol {
+        struct ax25_protocol *next;
+        unsigned int pid;
+        int (*func)(struct sk_buff *, ax25_cb *);
+};
+
+extern void ax25_register_pid(struct ax25_protocol *ap);
 extern void ax25_protocol_release(unsigned int);
 extern int __must_check ax25_linkfail_register(void (*)(ax25_cb *, int));
 extern void ax25_linkfail_release(void (*)(ax25_cb *, int));
diff --git a/net/ax25/ax25_iface.c b/net/ax25/ax25_iface.c
index 07ac0207eb69..dd9b7fee3df8 100644
--- a/net/ax25/ax25_iface.c
+++ b/net/ax25/ax25_iface.c
@@ -29,11 +29,7 @@
 #include <linux/mm.h>
 #include <linux/interrupt.h>
 
-static struct protocol_struct {
-        struct protocol_struct *next;
-        unsigned int pid;
-        int (*func)(struct sk_buff *, ax25_cb *);
-} *protocol_list = NULL;
+static struct ax25_protocol *protocol_list;
 static DEFINE_RWLOCK(protocol_list_lock);
 
 static struct linkfail_struct {
@@ -49,36 +45,23 @@ static struct listen_struct {
 } *listen_list = NULL;
 static DEFINE_SPINLOCK(listen_lock);
 
-int ax25_protocol_register(unsigned int pid,
-        int (*func)(struct sk_buff *, ax25_cb *))
+/*
+ * Do not register the internal protocols AX25_P_TEXT, AX25_P_SEGMENT,
+ * AX25_P_IP or AX25_P_ARP ...
+ */
+void ax25_register_pid(struct ax25_protocol *ap)
 {
-        struct protocol_struct *protocol;
-
-        if (pid == AX25_P_TEXT || pid == AX25_P_SEGMENT)
-                return 0;
-#ifdef CONFIG_INET
-        if (pid == AX25_P_IP || pid == AX25_P_ARP)
-                return 0;
-#endif
-        if ((protocol = kmalloc(sizeof(*protocol), GFP_ATOMIC)) == NULL)
-                return 0;
-
-        protocol->pid  = pid;
-        protocol->func = func;
-
         write_lock_bh(&protocol_list_lock);
-        protocol->next = protocol_list;
-        protocol_list  = protocol;
+        ap->next = protocol_list;
+        protocol_list = ap;
         write_unlock_bh(&protocol_list_lock);
-
-        return 1;
 }
 
-EXPORT_SYMBOL(ax25_protocol_register);
+EXPORT_SYMBOL_GPL(ax25_register_pid);
 
 void ax25_protocol_release(unsigned int pid)
 {
-        struct protocol_struct *s, *protocol;
+        struct ax25_protocol *s, *protocol;
 
         write_lock_bh(&protocol_list_lock);
         protocol = protocol_list;
@@ -223,7 +206,7 @@ EXPORT_SYMBOL(ax25_listen_release);
 int (*ax25_protocol_function(unsigned int pid))(struct sk_buff *, ax25_cb *)
 {
         int (*res)(struct sk_buff *, ax25_cb *) = NULL;
-        struct protocol_struct *protocol;
+        struct ax25_protocol *protocol;
 
         read_lock(&protocol_list_lock);
         for (protocol = protocol_list; protocol != NULL; protocol = protocol->next)
@@ -263,7 +246,7 @@ void ax25_link_failed(ax25_cb *ax25, int reason)
 
 int ax25_protocol_is_registered(unsigned int pid)
 {
-        struct protocol_struct *protocol;
+        struct ax25_protocol *protocol;
         int res = 0;
 
         read_lock_bh(&protocol_list_lock);
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index 1d50f801f181..f4675bf3976c 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -1377,6 +1377,11 @@ 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 int __init nr_proto_init(void)
 {
         int i;
@@ -1424,7 +1429,7 @@ static int __init nr_proto_init(void)
                 
         register_netdevice_notifier(&nr_dev_notifier);
 
-        ax25_protocol_register(AX25_P_NETROM, nr_route_frame);
+        ax25_register_pid(&nr_pid);
         ax25_linkfail_register(nr_link_failed);
 
 #ifdef CONFIG_SYSCTL
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 08a542855654..1605069e5db1 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -1481,6 +1481,11 @@ static struct notifier_block rose_dev_notifier = {
 
 static struct net_device **dev_rose;
 
+static struct ax25_protocol rose_pid = {
+        .pid    = AX25_P_ROSE,
+        .func   = rose_route_frame
+};
+
 static int __init rose_proto_init(void)
 {
         int i;
@@ -1530,7 +1535,7 @@ static int __init rose_proto_init(void)
         sock_register(&rose_family_ops);
         register_netdevice_notifier(&rose_dev_notifier);
 
-        ax25_protocol_register(AX25_P_ROSE, rose_route_frame);
+        ax25_register_pid(&rose_pid);
         ax25_linkfail_register(rose_link_failed);
 
 #ifdef CONFIG_SYSCTL