Skip to content

Commit b1560d2

Browse files
adbridgeRyoheiHagimoto
authored andcommitted
Revert "Pairing fails when IPv6 enabled in SoftAP intf"
This reverts commit 18285e1.
1 parent 67c2f73 commit b1560d2

File tree

5 files changed

+0
-67
lines changed

5 files changed

+0
-67
lines changed

features/lwipstack/LWIPInterface.cpp

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -565,41 +565,6 @@ nsapi_error_t LWIP::add_ethernet_interface(EMAC &emac, bool default_if, OnboardN
565565
#endif //LWIP_ETHERNET
566566
}
567567

568-
nsapi_error_t LWIP::remove_ethernet_interface(OnboardNetworkStack::Interface **interface_out)
569-
{
570-
#if LWIP_ETHERNET
571-
572-
if ((interface_out != NULL) && (*interface_out != NULL)) {
573-
574-
Interface *lwip = static_cast<Interface *>(*interface_out);
575-
Interface *node = lwip->list;
576-
577-
if (lwip->list != NULL) {
578-
if (lwip->list == lwip) {
579-
lwip->list = lwip->list->next;
580-
netif_remove(&node->netif);
581-
*interface_out = NULL;
582-
delete node;
583-
} else {
584-
while (node->next != NULL && node->next != lwip) {
585-
node = node->next;
586-
}
587-
if (node->next != NULL && node->next == lwip) {
588-
Interface *remove = node->next;
589-
node->next = node->next->next;
590-
netif_remove(&remove->netif);
591-
*interface_out = NULL;
592-
delete remove;
593-
}
594-
}
595-
}
596-
}
597-
598-
return NSAPI_ERROR_OK;
599-
#else
600-
return NSAPI_ERROR_UNSUPPORTED;
601-
#endif //LWIP_ETHERNET
602-
}
603568

604569
nsapi_error_t LWIP::add_l3ip_interface(L3IP &l3ip, bool default_if, OnboardNetworkStack::Interface **interface_out)
605570
{

features/lwipstack/LWIPStack.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -288,14 +288,6 @@ class LWIP : public OnboardNetworkStack, private mbed::NonCopyable<LWIP> {
288288
* @param[out] interface_out pointer to stack interface object controlling the L3IP
289289
* @return NSAPI_ERROR_OK on success, or error code
290290
*/
291-
virtual nsapi_error_t remove_ethernet_interface(OnboardNetworkStack::Interface **interface_out);
292-
293-
/** Remove a network interface from IP stack
294-
*
295-
* Removes PPP objects,network interface from stack list, and shutdown device driver.
296-
* @param[out] interface_out pointer to stack interface object controlling the PPP
297-
* @return NSAPI_ERROR_OK on success, or error code
298-
*/
299291
virtual nsapi_error_t remove_l3ip_interface(OnboardNetworkStack::Interface **interface_out);
300292

301293
/** Remove a network interface from IP stack

features/netsocket/OnboardNetworkStack.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,6 @@ class OnboardNetworkStack : public NetworkStack {
169169
return NSAPI_ERROR_UNSUPPORTED;
170170
};
171171

172-
virtual nsapi_error_t remove_ethernet_interface(Interface **interface_out)
173-
{
174-
return NSAPI_ERROR_OK;
175-
};
176-
177172
virtual nsapi_error_t remove_l3ip_interface(Interface **interface_out)
178173
{
179174
return NSAPI_ERROR_OK;

features/netsocket/emac-drivers/TARGET_Cypress/COMPONENT_WHD/interface/WhdSTAInterface.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -355,15 +355,6 @@ nsapi_error_t WhdSTAInterface::disconnect()
355355
}
356356
whd_emac_wifi_link_state_changed(_whd_emac.ifp, WHD_FALSE);
357357

358-
// remove the interface added in connect
359-
if (_interface) {
360-
nsapi_error_t err = _stack.remove_ethernet_interface(&_interface);
361-
if (err != NSAPI_ERROR_OK) {
362-
return err;
363-
}
364-
_iface_shared.iface_sta = NULL;
365-
}
366-
367358
res = whd_wifi_deregister_event_handler(_whd_emac.ifp, sta_link_update_entry);
368359
if (res != WHD_SUCCESS) {
369360
return whd_toerror(res);

features/netsocket/emac-drivers/TARGET_Cypress/COMPONENT_WHD/interface/WhdSoftAPInterface.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -201,16 +201,6 @@ int WhdSoftAPInterface::stop(void)
201201
if (res != WHD_SUCCESS) {
202202
return whd_toerror(res);
203203
}
204-
205-
// remove the interface added in start
206-
if (_interface) {
207-
nsapi_error_t err = _stack.remove_ethernet_interface(&_interface);
208-
if (err != NSAPI_ERROR_OK) {
209-
return err;
210-
}
211-
_iface_shared.iface_softap = NULL;
212-
}
213-
214204
return NSAPI_ERROR_OK;
215205
}
216206

0 commit comments

Comments
 (0)