diff options
| author | vivek <vivek@cumulusnetworks.com> | 2018-03-10 04:14:17 +0000 |
|---|---|---|
| committer | vivek <vivek@cumulusnetworks.com> | 2018-03-10 04:14:17 +0000 |
| commit | 7d39cd191c885608731a82a2cedf2b8953d3bf1c (patch) | |
| tree | 6f3003ab8d9b0284d86637849a2d5473ae878005 /lib/qobj.c | |
| parent | d0be47e8e152e82270770bdb77aea620ea9b3ab2 (diff) | |
| parent | 58e7db106d5907cb129fcc316f02ce0bf34e3885 (diff) | |
Merge branch 'master' of https://github.com/frrouting/frr into pmsi-parse-display
Conflicts:
bgpd/bgp_attr.c
Diffstat (limited to 'lib/qobj.c')
| -rw-r--r-- | lib/qobj.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/qobj.c b/lib/qobj.c index c75002052e..c3f1a27c82 100644 --- a/lib/qobj.c +++ b/lib/qobj.c @@ -98,9 +98,7 @@ void qobj_init(void) { if (!nodes) { pthread_rwlock_init(&nodes_lock, NULL); - nodes = hash_create_size(16, qobj_key, - qobj_cmp, - "QOBJ Hash"); + nodes = hash_create_size(16, qobj_key, qobj_cmp, "QOBJ Hash"); } } |