Merge commit '10c2e1e0125dfa600b1c2b6553883cccf2d025dd' into integrated

diff --cc proto/ospf/ospf.c
index eaa452d1c2a4593a6a1995442168734f4255c571,e751f7ca889af7ee149d217594f659a6419b2440..7f62ce5808e0801a4d7c636d4e3ae8d20cb7d485
--- 1/proto/ospf/ospf.c
--- 2/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;