Skip to content

Commit 10758c6

Browse files
committed
Revert "Fix compile issues with LWIP_SINGLE_NETIF (#515)"
This reverts commit 2507272.
1 parent 2507272 commit 10758c6

File tree

8 files changed

+7
-8
lines changed

8 files changed

+7
-8
lines changed

pico_w/bt/picow_bt_example_common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ void picow_bt_example_main(void) {
9797
} else {
9898
printf("Connected in %lus.\n", (to_ms_since_boot(get_absolute_time()) - start_ms) / 1000);
9999
}
100-
printf("\nReady, running iperf server at %s\n", ip4addr_ntoa(netif_ip4_addr(netif_default)));
100+
printf("\nReady, running iperf server at %s\n", ip4addr_ntoa(netif_ip4_addr(netif_list)));
101101
lwiperf_start_tcp_server_default(&iperf_report, NULL);
102102
#endif
103103
}

pico_w/bt/standalone/server_with_wifi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ int main() {
100100

101101
// setup iperf
102102
cyw43_arch_lwip_begin();
103-
printf("\nReady, running iperf server at %s\n", ip4addr_ntoa(netif_ip4_addr(netif_default)));
103+
printf("\nReady, running iperf server at %s\n", ip4addr_ntoa(netif_ip4_addr(netif_list)));
104104
lwiperf_start_tcp_server_default(&iperf_report, NULL);
105105
cyw43_arch_lwip_end();
106106

pico_w/wifi/freertos/httpd/pico_freertos_httpd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ void main_task(__unused void *params) {
158158
#endif
159159
#endif
160160

161-
printf("\nReady, running httpd at %s\n", ip4addr_ntoa(netif_ip4_addr(netif_default)));
161+
printf("\nReady, running httpd at %s\n", ip4addr_ntoa(netif_ip4_addr(netif_list)));
162162
httpd_init();
163163

164164
http_set_cgi_handlers(cgi_handlers, LWIP_ARRAYSIZE(cgi_handlers));

pico_w/wifi/freertos/iperf/picow_freertos_iperf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ void main_task(__unused void *params) {
7979
ip4_addr_set_u32(&clientaddr, ipaddr_addr(xstr(IPERF_SERVER_IP)));
8080
assert(lwiperf_start_tcp_client_default(&clientaddr, &iperf_report, NULL) != NULL);
8181
#else
82-
printf("\nReady, running iperf server at %s\n", ip4addr_ntoa(netif_ip4_addr(netif_default)));
82+
printf("\nReady, running iperf server at %s\n", ip4addr_ntoa(netif_ip4_addr(netif_list)));
8383
lwiperf_start_tcp_server_default(&iperf_report, NULL);
8484
#endif
8585
cyw43_arch_lwip_end();

pico_w/wifi/httpd/pico_httpd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ int main() {
203203
} else {
204204
printf("Connected.\n");
205205
}
206-
printf("\nReady, running httpd at %s\n", ip4addr_ntoa(netif_ip4_addr(netif_default)));
206+
printf("\nReady, running httpd at %s\n", ip4addr_ntoa(netif_ip4_addr(netif_list)));
207207

208208
// start http server
209209
wifi_connected_time = get_absolute_time();

pico_w/wifi/iperf/picow_iperf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ int main() {
7272
ip4_addr_set_u32(&clientaddr, ipaddr_addr(xstr(IPERF_SERVER_IP)));
7373
assert(lwiperf_start_tcp_client_default(&clientaddr, &iperf_report, NULL) != NULL);
7474
#else
75-
printf("\nReady, running iperf server at %s\n", ip4addr_ntoa(netif_ip4_addr(netif_default)));
75+
printf("\nReady, running iperf server at %s\n", ip4addr_ntoa(netif_ip4_addr(netif_list)));
7676
lwiperf_start_tcp_server_default(&iperf_report, NULL);
7777
#endif
7878
cyw43_arch_lwip_end();

pico_w/wifi/lwipopts_examples_common.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
#define LWIP_NETIF_TX_SINGLE_PBUF 1
5252
#define DHCP_DOES_ARP_CHECK 0
5353
#define LWIP_DHCP_DOES_ACD_CHECK 0
54-
#define LWIP_SINGLE_NETIF 1
5554

5655
#ifndef NDEBUG
5756
#define LWIP_DEBUG 1

pico_w/wifi/tcp_server/picow_tcp_server.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ static err_t tcp_server_accept(void *arg, struct tcp_pcb *client_pcb, err_t err)
187187

188188
static bool tcp_server_open(void *arg) {
189189
TCP_SERVER_T *state = (TCP_SERVER_T*)arg;
190-
DEBUG_printf("Starting server at %s on port %u\n", ip4addr_ntoa(netif_ip4_addr(netif_default)), TCP_PORT);
190+
DEBUG_printf("Starting server at %s on port %u\n", ip4addr_ntoa(netif_ip4_addr(netif_list)), TCP_PORT);
191191

192192
struct tcp_pcb *pcb = tcp_new_ip_type(IPADDR_TYPE_ANY);
193193
if (!pcb) {

0 commit comments

Comments
 (0)