diff options
Diffstat (limited to 'net/tipc/bcast.c')
-rw-r--r-- | net/tipc/bcast.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c index 1bb75703f384..730c5c47ed8d 100644 --- a/net/tipc/bcast.c +++ b/net/tipc/bcast.c | |||
@@ -774,8 +774,8 @@ int tipc_bclink_set_queue_limits(u32 limit) | |||
774 | 774 | ||
775 | int tipc_bclink_init(void) | 775 | int tipc_bclink_init(void) |
776 | { | 776 | { |
777 | bcbearer = kmalloc(sizeof(*bcbearer), GFP_ATOMIC); | 777 | bcbearer = kzalloc(sizeof(*bcbearer), GFP_ATOMIC); |
778 | bclink = kmalloc(sizeof(*bclink), GFP_ATOMIC); | 778 | bclink = kzalloc(sizeof(*bclink), GFP_ATOMIC); |
779 | if (!bcbearer || !bclink) { | 779 | if (!bcbearer || !bclink) { |
780 | nomem: | 780 | nomem: |
781 | warn("Multicast link creation failed, no memory\n"); | 781 | warn("Multicast link creation failed, no memory\n"); |
@@ -786,14 +786,12 @@ int tipc_bclink_init(void) | |||
786 | return -ENOMEM; | 786 | return -ENOMEM; |
787 | } | 787 | } |
788 | 788 | ||
789 | memset(bcbearer, 0, sizeof(struct bcbearer)); | ||
790 | INIT_LIST_HEAD(&bcbearer->bearer.cong_links); | 789 | INIT_LIST_HEAD(&bcbearer->bearer.cong_links); |
791 | bcbearer->bearer.media = &bcbearer->media; | 790 | bcbearer->bearer.media = &bcbearer->media; |
792 | bcbearer->media.send_msg = tipc_bcbearer_send; | 791 | bcbearer->media.send_msg = tipc_bcbearer_send; |
793 | sprintf(bcbearer->media.name, "tipc-multicast"); | 792 | sprintf(bcbearer->media.name, "tipc-multicast"); |
794 | 793 | ||
795 | bcl = &bclink->link; | 794 | bcl = &bclink->link; |
796 | memset(bclink, 0, sizeof(struct bclink)); | ||
797 | INIT_LIST_HEAD(&bcl->waiting_ports); | 795 | INIT_LIST_HEAD(&bcl->waiting_ports); |
798 | bcl->next_out_no = 1; | 796 | bcl->next_out_no = 1; |
799 | spin_lock_init(&bclink->node.lock); | 797 | spin_lock_init(&bclink->node.lock); |