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

Commit 2710b57f authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[TIPC]: Use kzalloc where appropriate 



Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
parent e69062b4

net/tipc/bcast.c

+2 −4
Original line number Diff line number Diff line
@@ -774,8 +774,8 @@ int tipc_bclink_set_queue_limits(u32 limit) 


int tipc_bclink_init(void)

{

	bcbearer = kmalloc(sizeof(*bcbearer), GFP_ATOMIC);

	bclink = kmalloc(sizeof(*bclink), GFP_ATOMIC);

	bcbearer = kzalloc(sizeof(*bcbearer), GFP_ATOMIC);

	bclink = kzalloc(sizeof(*bclink), GFP_ATOMIC);

	if (!bcbearer || !bclink) {

 nomem:

	 	warn("Multicast link creation failed, no memory\n");
@@ -786,14 +786,12 @@ int tipc_bclink_init(void) 
		return -ENOMEM;

	}



	memset(bcbearer, 0, sizeof(struct bcbearer));

	INIT_LIST_HEAD(&bcbearer->bearer.cong_links);

	bcbearer->bearer.media = &bcbearer->media;

	bcbearer->media.send_msg = tipc_bcbearer_send;

	sprintf(bcbearer->media.name, "tipc-multicast");



	bcl = &bclink->link;

	memset(bclink, 0, sizeof(struct bclink));

	INIT_LIST_HEAD(&bcl->waiting_ports);

	bcl->next_out_no = 1;

	spin_lock_init(&bclink->node.lock);

net/tipc/node.c

+1 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ struct node *tipc_node_create(u32 addr) 
	struct node *n_ptr;

        struct node **curr_node;



	n_ptr = kmalloc(sizeof(*n_ptr),GFP_ATOMIC);

	n_ptr = kzalloc(sizeof(*n_ptr),GFP_ATOMIC);

	if (!n_ptr) {

		warn("Node creation failed, no memory\n");

		return NULL;
@@ -75,7 +75,6 @@ struct node *tipc_node_create(u32 addr) 
		return NULL;

	}

		

	memset(n_ptr, 0, sizeof(*n_ptr));

	n_ptr->addr = addr;

                spin_lock_init(&n_ptr->lock);

	INIT_LIST_HEAD(&n_ptr->nsub);

net/tipc/subscr.c

+1 −2
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ static void subscr_subscribe(struct tipc_subscr *s, 


	/* Allocate subscription object */



	sub = kmalloc(sizeof(*sub), GFP_ATOMIC);

	sub = kzalloc(sizeof(*sub), GFP_ATOMIC);

	if (!sub) {

		warn("Subscription rejected, no memory\n");

		subscr_terminate(subscriber);
@@ -359,7 +359,6 @@ static void subscr_subscribe(struct tipc_subscr *s, 


	/* Initialize subscription object */



	memset(sub, 0, sizeof(*sub));

	sub->seq.type = htohl(s->seq.type, subscriber->swap);

	sub->seq.lower = htohl(s->seq.lower, subscriber->swap);

	sub->seq.upper = htohl(s->seq.upper, subscriber->swap);