Revert "mm: change PMID when an access rights request is not confirmed"

This reverts commit de54717db07a467e3777ec23beb184ad1b8ec5a0.

Major misunderstanding, the PMID is supposed to get changed on
unconfirmed MAC layer Access requests, not on Access rights requests.

Signed-off-by: Patrick MCHardy <kaber@trash.net>

2 files changed, 3 insertions, 5 deletions

diff --git a/src/lce.c b/src/lce.c
index 4edadcd..97bc376 100644
--- a/src/lce.c
+++ b/src/lce.c
@@ -1377,14 +1377,14 @@ static void dect_pp_set_default_pmid(struct dect_handle *dh)
 	assert(!(dh->flags & DECT_PP_TPUI));
 	dh->pmid = DECT_PMID_DEFAULT_ID +
 		   (rand() & DECT_PMID_DEFAULT_NUM_MASK);
-	lce_debug("set default PMID: %05x\n", dh->pmid);
+	lce_debug("set default pmid %05x\n", dh->pmid);
 }
 
 void dect_pp_change_pmid(struct dect_handle *dh)
 {
 	dh->pmid = DECT_PMID_DEFAULT_ID +
 		   ((dh->pmid + 1) & DECT_PMID_DEFAULT_NUM_MASK);
-	lce_debug("change PMID: %05x\n", dh->pmid);
+	lce_debug("change pmid %05x\n", dh->pmid);
 }
 
 static void dect_pp_set_assigned_pmid(struct dect_handle *dh)
@@ -1394,7 +1394,7 @@ static void dect_pp_set_assigned_pmid(struct dect_handle *dh)
 	assert(dh->flags & DECT_PP_TPUI &&
 	       dh->tpui.type == DECT_TPUI_INDIVIDUAL_ASSIGNED);
 	dh->pmid = dect_build_pmid(dect_tpui_to_pmid(&pmid, &dh->tpui));
-	lce_debug("set assigned PMID: %05x\n", dh->pmid);
+	lce_debug("set assigned pmid %05x\n", dh->pmid);
 }
 
 /**
diff --git a/src/mm.c b/src/mm.c
index 4f1fe2f..4c318c3 100644
--- a/src/mm.c
+++ b/src/mm.c
@@ -1505,7 +1505,6 @@ static void dect_mm_access_rights_abort(struct dect_handle *dh,
 					struct dect_mm_procedure *mp)
 {
 	mm_debug(mme, "MM_ACCESS_RIGHTS-cfm: accept: 0");
-	dect_pp_change_pmid(dh);
 	dh->ops->mm_ops->mm_access_rights_cfm(dh, mme, false, NULL);
 }
 
@@ -1575,7 +1574,6 @@ static void dect_mm_rcv_access_rights_reject(struct dect_handle *dh,
 	dect_mm_procedure_complete(dh, mme, mp);
 
 	mm_debug(mme, "MM_ACCESS_RIGHTS-cfm: accept: 0");
-	dect_pp_change_pmid(dh);
 	dh->ops->mm_ops->mm_access_rights_cfm(dh, mme, false, param);
 	dect_ie_collection_put(dh, param);
 err1: