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 88fac53310411cff320d054ff92369703b65e678..5640168deac89ffb678abdd67c0fdc074cee9f0a 100644 (file)
--- 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);