Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b30dd35 authored by Ralf Baechle's avatar Ralf Baechle Committed by David S. Miller
Browse files

[AX.25]: Use kzalloc 



Replace kzalloc instead of kmalloc + memset.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 24781734

net/ax25/af_ax25.c

+1 −2
Original line number Diff line number Diff line
@@ -486,10 +486,9 @@ ax25_cb *ax25_create_cb(void) 
{

	ax25_cb *ax25;



	if ((ax25 = kmalloc(sizeof(*ax25), GFP_ATOMIC)) == NULL)

	if ((ax25 = kzalloc(sizeof(*ax25), GFP_ATOMIC)) == NULL)

		return NULL;



	memset(ax25, 0x00, sizeof(*ax25));

	atomic_set(&ax25->refcount, 1);



	skb_queue_head_init(&ax25->write_queue);

net/ax25/ax25_dev.c

+1 −3
Original line number Diff line number Diff line
@@ -55,15 +55,13 @@ void ax25_dev_device_up(struct net_device *dev) 
{

	ax25_dev *ax25_dev;



	if ((ax25_dev = kmalloc(sizeof(*ax25_dev), GFP_ATOMIC)) == NULL) {

	if ((ax25_dev = kzalloc(sizeof(*ax25_dev), GFP_ATOMIC)) == NULL) {

		printk(KERN_ERR "AX.25: ax25_dev_device_up - out of memory\n");

		return;

	}



	ax25_unregister_sysctl();



	memset(ax25_dev, 0x00, sizeof(*ax25_dev));



	dev->ax25_ptr     = ax25_dev;

	ax25_dev->dev     = dev;

	dev_hold(dev);

net/netrom/af_netrom.c

+1 −3
Original line number Diff line number Diff line
@@ -1382,14 +1382,12 @@ static int __init nr_proto_init(void) 
		return -1;

	}



	dev_nr = kmalloc(nr_ndevs * sizeof(struct net_device *), GFP_KERNEL);

	dev_nr = kzalloc(nr_ndevs * sizeof(struct net_device *), GFP_KERNEL);

	if (dev_nr == NULL) {

		printk(KERN_ERR "NET/ROM: nr_proto_init - unable to allocate device array\n");

		return -1;

	}



	memset(dev_nr, 0x00, nr_ndevs * sizeof(struct net_device *));



	for (i = 0; i < nr_ndevs; i++) {

		char name[IFNAMSIZ];

		struct net_device *dev;

net/rose/af_rose.c

+1 −2
Original line number Diff line number Diff line
@@ -1490,14 +1490,13 @@ static int __init rose_proto_init(void) 


	rose_callsign = null_ax25_address;



	dev_rose = kmalloc(rose_ndevs * sizeof(struct net_device *), GFP_KERNEL);

	dev_rose = kzalloc(rose_ndevs * sizeof(struct net_device *), GFP_KERNEL);

	if (dev_rose == NULL) {

		printk(KERN_ERR "ROSE: rose_proto_init - unable to allocate device structure\n");

		rc = -ENOMEM;

		goto out_proto_unregister;

	}



	memset(dev_rose, 0x00, rose_ndevs * sizeof(struct net_device*));

	for (i = 0; i < rose_ndevs; i++) {

		struct net_device *dev;

		char name[IFNAMSIZ];