From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Fri, 2 May 2014 15:18:36 +0000 (+0200)
Subject: Merge commit '10c2e1e0125dfa600b1c2b6553883cccf2d025dd' into integrated
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b9bfcbc4ad1de8e2c096459dc9b43d5121017bd;p=thirdparty%2Fbird.git

Merge commit '10c2e1e0125dfa600b1c2b6553883cccf2d025dd' into integrated
---

7b9bfcbc4ad1de8e2c096459dc9b43d5121017bd
diff --cc proto/ospf/ospf.c
index eaa452d1c,e751f7ca8..7f62ce580
--- a/proto/ospf/ospf.c
+++ b/proto/ospf/ospf.c
@@@ -1227,8 -1275,7 +1227,7 @@@ voi
  ospf_sh_state(struct proto *p, int verbose, int reachable)
  {
    struct proto_ospf *po = (struct proto_ospf *) p;
 -  struct ospf_lsa_header *cnode = NULL;
 +  int ospf2 = ospf_is_v2(po);
-   int num = po->gr->hash_entries;
    unsigned int i, ix, j1, j2, jx;
    u32 last_area = 0xFFFFFFFF;