diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-06-04 10:31:37 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-06-04 10:31:37 -0700 |
| commit | db08408462ac8afa1b95aec4eb8d3efeb283025d (patch) | |
| tree | ece8ff3df7fce16c95c4057f32346beae979dbd0 /ospf6d/ospf6_snmp.c | |
| parent | cd2ec99e4e365bd61deebd61639cd3e1e777cdbe (diff) | |
| parent | 6e0989e113d9e2268e58cfe29922e971793c1d06 (diff) | |
| download | quagga-db08408462ac8afa1b95aec4eb8d3efeb283025d.tar.bz2 quagga-db08408462ac8afa1b95aec4eb8d3efeb283025d.tar.xz | |
Merge branch 'upstream' into jenner
Conflicts:
bgpd/bgp_aspath.c
bgpd/bgpd.c
lib/smux.c
lib/workqueue.c
ospfd/ospf_snmp.c
Diffstat (limited to 'ospf6d/ospf6_snmp.c')
| -rw-r--r-- | ospf6d/ospf6_snmp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ospf6d/ospf6_snmp.c b/ospf6d/ospf6_snmp.c index 3cb26d0c..5ac7846d 100644 --- a/ospf6d/ospf6_snmp.c +++ b/ospf6d/ospf6_snmp.c @@ -47,6 +47,7 @@ #include "ospf6_message.h" #include "ospf6_neighbor.h" #include "ospf6d.h" +#include "ospf6_snmp.h" /* OSPFv3-MIB */ #define OSPFv3MIB 1,3,6,1,3,102 |