From: vivek <vivek@cumulusnetworks.com>
Date: Fri, 19 Feb 2016 22:18:35 +0000 (-0800)
Subject: Zebra: Tweak netlink socket creation function
X-Git-Tag: frr-2.0-rc1~1116
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=c3c06a51aaa0b0371831915681cbaefd04717cca;p=mirror%2Ffrr.git

Zebra: Tweak netlink socket creation function

Since the netlink socket is per namespace and not per VRF, do not
invoke vrf_socket().

Note: This needs to be changed when we support multiple namespaces -
needed only for upstreaming.

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
Reviewed-by:   Donald Sharp <sharpd@cumulusnetworks.com>

Ticket: CM-9206
Reviewed By: CCR-4127
Testing Done:
---

diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index ea3c45c778..0721df7a4d 100644
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -161,7 +161,7 @@ netlink_socket (struct nlsock *nl, unsigned long groups, ns_id_t ns_id)
       return -1;
     }
 
-  sock = vrf_socket (AF_NETLINK, SOCK_RAW, NETLINK_ROUTE, ns_id);
+  sock = socket (AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
   if (sock < 0)
     {
       zlog (NULL, LOG_ERR, "Can't open %s socket: %s", nl->name,