From 2f09fc13dd295a52dcec64104f5bf3e25cda6de1 Mon Sep 17 00:00:00 2001
From: Kirill Andreev <andreev@iitp.ru>
Date: Mon, 15 Jun 2009 18:14:06 +0400
Subject: [PATCH] Fixed peer management state machine

---
 src/devices/mesh/dot11s/peer-link.cc                | 5 -----
 src/devices/mesh/dot11s/peer-link.h                 | 7 ++-----
 src/devices/mesh/dot11s/peer-management-protocol.cc | 5 +----
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/devices/mesh/dot11s/peer-link.cc b/src/devices/mesh/dot11s/peer-link.cc
index 746127383..d77dcaf51 100644
--- a/src/devices/mesh/dot11s/peer-link.cc
+++ b/src/devices/mesh/dot11s/peer-link.cc
@@ -171,11 +171,6 @@ PeerLink::MLMECancelPeerLink (PmpReasonCode reason)
   StateMachine (CNCL,reason);
 }
 void
-PeerLink::MLMEPassivePeerLinkOpen ()
-{
-  StateMachine (PASOPN);
-}
-void
 PeerLink::MLMEActivePeerLinkOpen ()
 {
   StateMachine (ACTOPN);
diff --git a/src/devices/mesh/dot11s/peer-link.h b/src/devices/mesh/dot11s/peer-link.h
index 6c5d8aa5a..8048ddc15 100644
--- a/src/devices/mesh/dot11s/peer-link.h
+++ b/src/devices/mesh/dot11s/peer-link.h
@@ -83,8 +83,6 @@ public:
    */
   /// MLME-CancelPeerLink.request
   void MLMECancelPeerLink (PmpReasonCode reason);
-  /// MLME-PassivePeerLinkOpen.request
-  void MLMEPassivePeerLinkOpen ();
   /// MLME-ActivePeerLinkOpen.request
   void MLMEActivePeerLinkOpen ();
   /// MLME-PeeringRequestReject
@@ -151,9 +149,8 @@ private:
   /// Peer link events, see 802.11s draft 11B.3.3.2
   enum  PeerEvent
   {
-    CNCL,       ///< MLME-CancelPeerLink
-    PASOPN,     ///< MLME-PassivePeerLinkOpen
-    ACTOPN,     ///< MLME-ActivePeerLinkOpen
+    CNCL,       ///< Cancel peer link
+    ACTOPN,     ///< Active peer link open
     CLS_ACPT,   ///< PeerLinkClose_Accept
     OPN_ACPT,   ///< PeerLinkOpen_Accept
     OPN_RJCT,   ///< PeerLinkOpen_Reject
diff --git a/src/devices/mesh/dot11s/peer-management-protocol.cc b/src/devices/mesh/dot11s/peer-management-protocol.cc
index 3e9a2c4fe..6ad732cf4 100644
--- a/src/devices/mesh/dot11s/peer-management-protocol.cc
+++ b/src/devices/mesh/dot11s/peer-management-protocol.cc
@@ -229,10 +229,7 @@ PeerManagementProtocol::ReceivePeerLinkFrame (
       if (peerLink == 0)
         peerLink = InitiateLink (interface, peerAddress, peerMeshPointAddress, Simulator::Now (), Seconds(1.0));
       if(!reject)
-        {
-          peerLink->MLMEPassivePeerLinkOpen ();
-          peerLink->OpenAccept (peerManagementElement.GetLocalLinkId(), meshConfig, peerMeshPointAddress);
-        }
+        peerLink->OpenAccept (peerManagementElement.GetLocalLinkId(), meshConfig, peerMeshPointAddress);
       else
         peerLink->OpenReject (peerManagementElement.GetLocalLinkId(), meshConfig, peerMeshPointAddress, reasonCode);
     }