Merge pull request #1449 from donaldsharp/match_local_peer

bgpd: XMALLOC usage causes borken assumption in route_match_peer_free

diff --git a/COMMUNITY.md b/COMMUNITY.md
index 8800aab97faff153819538767d1f15ff797a86f7..7605b03201ae1f12038e18b05ff6c4dda3886e60 100644 (file)
--- a/COMMUNITY.md
+++ b/COMMUNITY.md
@@ -82,7 +82,7 @@ for the release notes.
 
 ### Pre-submission Checklist
 
-* Format code (see [Coding style requirements](#coding-style-requirements))
+* Format code (see [Developer's Guidelines](#developers-guidelines))
 * Verify and acknowledge license (see [License for contributions](#license-for-contributions))
 * Ensure you have properly signed off (see [Signing Off](#signing-off))
 * Test building with various configurations:

diff --git a/isisd/isisd.c b/isisd/isisd.c
index d4e5a4e29b59f98de0fad297a586ff6127c4fb14..a6a220272883e4e66ca4d51c670435d66800d482 100644 (file)
--- a/isisd/isisd.c
+++ b/isisd/isisd.c
@@ -1521,7 +1521,7 @@ DEFUN_NOSH (router_isis,
 DEFUN (no_router_isis,
        no_router_isis_cmd,
        "no router isis WORD",
-       "no\n" ROUTER_STR "ISO IS-IS\n" "ISO Routing area tag")
+       "no\n" ROUTER_STR "ISO IS-IS\n" "ISO Routing area tag\n")
 {
        int idx_word = 3;
        return isis_area_destroy(vty, argv[idx_word]->arg);

diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c
index 39f005e55a60b16fbe8bc09a964d0ae9744dfabf..af17e49231fa5b6278d1c5656fb1f9c7ce93104c 100644 (file)
--- a/zebra/if_netlink.c
+++ b/zebra/if_netlink.c
@@ -221,8 +221,10 @@ static enum zebra_link_type netlink_to_zebra_link_type(unsigned int hwt)
                return ZEBRA_LLT_IEEE802_TR;
        case ARPHRD_IEEE80211:
                return ZEBRA_LLT_IEEE80211;
+#ifdef ARPHRD_IEEE802154
        case ARPHRD_IEEE802154:
                return ZEBRA_LLT_IEEE802154;
+#endif
 #ifdef ARPHRD_IP6GRE
        case ARPHRD_IP6GRE:
                return ZEBRA_LLT_IP6GRE;