--- /dev/null
+Index: quagga-0.99.21/bgpd/bgp_route.c
+===================================================================
+--- quagga-0.99.21.orig/bgpd/bgp_route.c
++++ quagga-0.99.21/bgpd/bgp_route.c
+@@ -2485,12 +2485,8 @@ bgp_default_originate (struct peer *peer
+ #ifdef HAVE_IPV6
+ else if (afi == AFI_IP6)
+ {
+- struct attr_extra *ae;
+- attr.extra = NULL;
+-
+- ae = bgp_attr_extra_get (&attr);
+- attr.extra = ae;
+-
++ struct attr_extra *ae = attr.extra;
++
+ str2prefix ("::/0", &p);
+
+ /* IPv6 global nexthop must be included. */