diff --git a/src/include/netif/ppp/pppos.h b/src/include/netif/ppp/pppos.h index df434d5d..cfb43801 100644 --- a/src/include/netif/ppp/pppos.h +++ b/src/include/netif/ppp/pppos.h @@ -103,10 +103,10 @@ struct pppos_pcb_s { ppp_pcb *pppos_create(struct netif *pppif, sio_fd_t fd, ppp_link_status_cb_fn link_status_cb, void *ctx_cb); -#if !NO_SYS +#if !NO_SYS && !PPP_INPROC_MULTITHREADED /* Pass received raw characters to PPPoS to be decoded through lwIP TCPIP thread. */ err_t pppos_input_tcpip(ppp_pcb *ppp, u_char *s, int l); -#endif /* !NO_SYS */ +#endif /* !NO_SYS && !PPP_INPROC_MULTITHREADED */ /* PPP over Serial: this is the input function to be called for received data. */ void pppos_input(ppp_pcb *ppp, u_char* data, int len); diff --git a/src/netif/ppp/pppos.c b/src/netif/ppp/pppos.c index 77fde8de..7e092de3 100644 --- a/src/netif/ppp/pppos.c +++ b/src/netif/ppp/pppos.c @@ -70,9 +70,9 @@ static err_t pppos_netif_input(ppp_pcb *ppp, void *ctx, struct pbuf *p, u16_t pr #endif /* VJ_SUPPORT */ /* Prototypes for procedures local to this file. */ -#if !NO_SYS +#if !NO_SYS && !PPP_INPROC_MULTITHREADED static err_t pppos_input_sys(struct pbuf *p, struct netif *inp); -#endif /* !NO_SYS */ +#endif /* !NO_SYS && !PPP_INPROC_MULTITHREADED */ #if PPP_INPROC_MULTITHREADED static void pppos_input_callback(void *arg); #endif /* PPP_INPROC_MULTITHREADED */ @@ -205,9 +205,9 @@ ppp_pcb *pppos_create(struct netif *pppif, sio_fd_t fd, pppos->ppp = ppp; pppos->fd = fd; -#if !NO_SYS +#if !NO_SYS && !PPP_INPROC_MULTITHREADED ppp->netif->input = pppos_input_sys; -#endif /* !NO_SYS */ +#endif /* !NO_SYS && !PPP_INPROC_MULTITHREADED */ ppp_link_set_callbacks(ppp, &pppos_callbacks, pppos); return ppp; } @@ -529,7 +529,7 @@ pppos_destroy(ppp_pcb *ppp, void *ctx) return ERR_OK; } -#if !NO_SYS +#if !NO_SYS && !PPP_INPROC_MULTITHREADED /** Pass received raw characters to PPPoS to be decoded through lwIP TCPIP thread. * * @param pcb PPP descriptor index, returned by pppos_create() @@ -567,7 +567,7 @@ static err_t pppos_input_sys(struct pbuf *p, struct netif *inp) { pbuf_free(p); return ERR_OK; } -#endif /* !NO_SYS */ +#endif /* !NO_SYS && !PPP_INPROC_MULTITHREADED */ /** PPPoS input helper struct, must be packed since it is stored * to pbuf->payload, which might be unaligned. */