merge

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);

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

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);
     }