diff options
| author | David Lamparter <equinox@diac24.net> | 2010-02-05 01:41:22 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2010-02-05 01:41:22 +0100 |
| commit | e473267ee96f48514b879f5dcaba2db64f0de9d1 (patch) | |
| tree | 6c252d564a2e2c00ef12abddd02fccd7ea89bc05 /ospfd/ospf_nsm.h | |
| parent | f06277c84f7604b380bdac491e23c848d4952d18 (diff) | |
| parent | b0c8c48d7fa4c691ddbe07403ccc37a26258a25e (diff) | |
| download | quagga-e473267ee96f48514b879f5dcaba2db64f0de9d1.tar.bz2 quagga-e473267ee96f48514b879f5dcaba2db64f0de9d1.tar.xz | |
Merge branch 'patches/pj_workqueue' into dn42
Conflicts:
lib/thread.c
Diffstat (limited to 'ospfd/ospf_nsm.h')
| -rw-r--r-- | ospfd/ospf_nsm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ospfd/ospf_nsm.h b/ospfd/ospf_nsm.h index 1121dae6..4f2ae808 100644 --- a/ospfd/ospf_nsm.h +++ b/ospfd/ospf_nsm.h @@ -39,7 +39,7 @@ /* OSPF Neighbor State Machine Event. */ #define NSM_NoEvent 0 -#define NSM_HelloReceived 1 +#define NSM_PacketReceived 1 /* HelloReceived in the protocol */ #define NSM_Start 2 #define NSM_TwoWayReceived 3 #define NSM_NegotiationDone 4 |