Skip to content

Commit e142eec

Browse files
Juha Heiskanenjuhhei01
authored andcommitted
Removed unused holdTime parameter from mle_table_entry.
1 parent c8a99cb commit e142eec

File tree

6 files changed

+0
-13
lines changed

6 files changed

+0
-13
lines changed

source/6LoWPAN/Thread/thread_host_bootstrap.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ static bool thread_parent_discover_timeout_cb(int8_t interface_id, uint16_t msgI
164164
entry_temp->threadNeighbor = true;
165165
entry_temp->short_adr = parent->shortAddress;
166166
entry_temp->priorityFlag = true;
167-
entry_temp->holdTime = 90;
168167

169168
mle_service_frame_counter_table_add(interface_id, entry_temp->attribute_index, parent->mleFrameCounter);
170169

@@ -339,7 +338,6 @@ static int thread_end_device_synch_response_validate(protocol_interface_info_ent
339338
entry_temp->threadNeighbor = true;
340339
entry_temp->short_adr = srcAddress;
341340
entry_temp->handshakeReady = 1;
342-
entry_temp->holdTime = 90;
343341
entry_temp->priorityFlag = true; // Make this our parent
344342
common_write_16_bit(entry_temp->short_adr, shortAddress);
345343

@@ -841,7 +839,6 @@ static void thread_mle_child_request_receive_cb(int8_t interface_id, mle_message
841839
//Update possible reed address by real router address
842840
scan_result->shortAddress = entry_temp->short_adr;
843841

844-
entry_temp->holdTime = 90;
845842
entry_temp->handshakeReady = 1;
846843
entry_temp->priorityFlag = true;
847844
entry_temp->threadNeighbor = true;

source/6LoWPAN/Thread/thread_mle_message_handler.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,6 @@ static void thread_parse_child_update_response(protocol_interface_info_entry_t *
812812

813813
timeout = cur->thread_info->host_link_timeout;
814814
if (mle_tlv_read_32_bit_tlv(MLE_TYPE_TIMEOUT, mle_msg->data_ptr, mle_msg->data_length, &timeout)) {
815-
entry_temp->holdTime = 90;
816815
tr_debug("Setting child timeout, value=%"PRIu32, timeout);
817816
mle_entry_timeout_update(entry_temp, timeout);
818817
}

source/6LoWPAN/Thread/thread_router_bootstrap.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1325,7 +1325,6 @@ void thread_router_bootstrap_child_id_handler(protocol_interface_info_entry_t *c
13251325
// If mac frame couter is less than previous we need to leave the old one
13261326

13271327
//Update or set neigh info
1328-
entry_temp->holdTime = 90;
13291328

13301329
mle_entry_timeout_update(entry_temp, req->timeout);
13311330
entry_temp->mode = req->mode;
@@ -1951,7 +1950,6 @@ void thread_router_bootstrap_mle_receive_cb(int8_t interface_id, mle_message_t *
19511950
if (mle_tlv_read_32_bit_tlv(MLE_TYPE_TIMEOUT, mle_msg->data_ptr, mle_msg->data_length, &timeout)) {
19521951

19531952
tr_debug("Setting child timeout, value=%"PRIu32, timeout);
1954-
entry_temp->holdTime = 90;
19551953
mle_entry_timeout_update(entry_temp, timeout);
19561954
}
19571955
if (!leaderDataReceived) {

source/MLE/mle.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,6 @@ static mle_neigh_table_entry_t *mle_class_get_free_entry(mle_neigh_table_list_t
531531
mle_entry->attribute_index = attribute_id;
532532
mle_entry->short_adr = 0xffff;
533533
mle_entry->mode = MLE_FFD_DEV | MLE_RX_ON_IDLE;
534-
mle_entry->holdTime = 7;
535534
mle_entry->last_contact_time = protocol_core_monotonic_time;
536535
mle_entry->medium_ttl_challenge = false;
537536
}

source/MLE/mle.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ typedef struct mle_neigh_table_entry_t {
149149
uint16_t ttl; /*!< destination TTL * 4 seconds */
150150
uint32_t last_contact_time; /*!< monotonic time - hard to define "contact"; used for Thread Leasequery replies */
151151
uint16_t timeout_rx;
152-
uint16_t holdTime;
153152
uint16_t link_margin;
154153
uint8_t mac64[8]; /*!< MAC64 */
155154
uint8_t mlEid[8];

test/nanostack/unittest/stub/mle_tlv_stub.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,6 @@ uint8_t *mle_tlv_write_timeout(uint8_t *ptr, uint32_t timeOut)
109109
return ptr + 6;
110110
}
111111

112-
uint8_t *mle_tlv_write_holdtime(uint8_t *ptr, uint16_t holdTime)
113-
{
114-
return ptr + 4;
115-
}
116-
117112
uint8_t *mle_tlv_write_challenge(uint8_t *ptr, uint8_t *challengePtr, uint8_t challenLen)
118113
{
119114
return ptr + challenLen + 2;

0 commit comments

Comments
 (0)