From: vivek <vivek@cumulusnetworks.com>
Date: Fri, 20 Nov 2015 19:09:25 +0000 (-0800)
Subject: Zebra: Ignore bridge address family netlink notifications
X-Git-Tag: frr-2.0-rc1~1189
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=ce2641ee1b440ecc10a3b73824970c2dffa3b96f;p=mirror%2Ffrr.git

Zebra: Ignore bridge address family netlink notifications

Ticket: CM-8045
Reviewed By: CCR-3736
Testing Done:

This is an import of patch zebra-ignore-bridge-af.patch from 2.5-br.
---

diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index 88fac53310..5640168dea 100644
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -497,6 +497,9 @@ netlink_interface (struct sockaddr_nl *snl, struct nlmsghdr *h,
   if (len < 0)
     return -1;
 
+  if (ifi->ifi_family == AF_BRIDGE)
+    return 0;
+
   /* Looking up interface name. */
   memset (tb, 0, sizeof tb);
   netlink_parse_rtattr (tb, IFLA_MAX, IFLA_RTA (ifi), len);
@@ -1081,6 +1084,9 @@ netlink_link_change (struct sockaddr_nl *snl, struct nlmsghdr *h,
   if (len < 0)
     return -1;
 
+  if (ifi->ifi_family == AF_BRIDGE)
+    return 0;
+
   /* Looking up interface name. */
   memset (tb, 0, sizeof tb);
   netlink_parse_rtattr (tb, IFLA_MAX, IFLA_RTA (ifi), len);