From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Tue, 29 Apr 2014 13:08:17 +0000 (+0200)
Subject: Merge commit 'f83ce94d5e410d5e5b921121867321c19451896b' into integrated
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6310da3509896933b5a05d1a01849c5af41f75e1;p=thirdparty%2Fbird.git

Merge commit 'f83ce94d5e410d5e5b921121867321c19451896b' into integrated
---

6310da3509896933b5a05d1a01849c5af41f75e1
diff --cc sysdep/linux/netlink.c
index 5b4698589,08dc11b6e..0f458b2c8
--- a/sysdep/linux/netlink.c
+++ b/sysdep/linux/netlink.c
@@@ -1113,6 -1096,7 +1112,7 @@@ krt_sys_start(struct krt_proto *p
  void
  krt_sys_shutdown(struct krt_proto *p UNUSED)
  {
 -  nl_table_map[KRT_CF->sys.table_id] = NULL;
++  nl_tablex_map(p->addr_type == RT_IPV4)[KRT_CF->sys.table_id] = NULL;
  }
  
  int