aboutsummaryrefslogtreecommitdiffstats
path: root/net/netrom/af_netrom.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2006-12-14 18:50:01 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-18 00:59:08 -0500
commit8d5cf596d10d740b69b5f4bbdb54b85abf75810d (patch)
treef0fd6a296f1b90d5fb1898ce1932c6ec5d245465 /net/netrom/af_netrom.c
parentc9266b99e2def0a456766220df09713f8e765891 (diff)
[AX.25]: Fix unchecked ax25_protocol_register uses.
Replace ax25_protocol_register by ax25_register_pid which assumes the caller has done the memory allocation. This allows replacing the kmalloc allocations entirely by static allocations. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netrom/af_netrom.c')
-rw-r--r--net/netrom/af_netrom.c7
1 files changed, 6 insertions, 1 deletions
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 = {
1377 1377
1378static struct net_device **dev_nr; 1378static struct net_device **dev_nr;
1379 1379
1380static struct ax25_protocol nr_pid = {
1381 .pid = AX25_P_NETROM,
1382 .func = nr_route_frame
1383};
1384
1380static int __init nr_proto_init(void) 1385static int __init nr_proto_init(void)
1381{ 1386{
1382 int i; 1387 int i;
@@ -1424,7 +1429,7 @@ static int __init nr_proto_init(void)
1424 1429
1425 register_netdevice_notifier(&nr_dev_notifier); 1430 register_netdevice_notifier(&nr_dev_notifier);
1426 1431
1427 ax25_protocol_register(AX25_P_NETROM, nr_route_frame); 1432 ax25_register_pid(&nr_pid);
1428 ax25_linkfail_register(nr_link_failed); 1433 ax25_linkfail_register(nr_link_failed);
1429 1434
1430#ifdef CONFIG_SYSCTL 1435#ifdef CONFIG_SYSCTL