From 5097ac05bf6eeb7b96413083bbca9b2aae16f19a Mon Sep 17 00:00:00 2001 From: Sylvain Rochet Date: Sat, 14 Mar 2015 13:59:44 +0100 Subject: [PATCH] PPP, fixed warnings if LWIP_SNMP is disabled --- src/netif/ppp/pppoe.c | 6 +++++- src/netif/ppp/pppol2tp.c | 6 +++++- src/netif/ppp/pppos.c | 2 ++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/netif/ppp/pppoe.c b/src/netif/ppp/pppoe.c index 273a0192..48251f4e 100644 --- a/src/netif/ppp/pppoe.c +++ b/src/netif/ppp/pppoe.c @@ -212,6 +212,8 @@ static err_t pppoe_write(ppp_pcb *ppp, void *ctx, struct pbuf *p) { err_t ret; #if LWIP_SNMP u16_t tot_len; +#else /* LWIP_SNMP */ + LWIP_UNUSED_ARG(ppp); #endif /* LWIP_SNMP */ /* skip address & flags */ @@ -250,10 +252,12 @@ static err_t pppoe_netif_output(ppp_pcb *ppp, void *ctx, struct pbuf *p, u_short struct pppoe_softc *sc = (struct pppoe_softc *)ctx; struct pbuf *pb; u8_t *pl; + err_t err; #if LWIP_SNMP u16_t tot_len; +#else /* LWIP_SNMP */ + LWIP_UNUSED_ARG(ppp); #endif /* LWIP_SNMP */ - err_t err; /* @todo: try to use pbuf_header() here! */ pb = pbuf_alloc(PBUF_LINK, PPPOE_HEADERLEN + sizeof(protocol), PBUF_RAM); diff --git a/src/netif/ppp/pppol2tp.c b/src/netif/ppp/pppol2tp.c index d1b69416..57d4de2f 100644 --- a/src/netif/ppp/pppol2tp.c +++ b/src/netif/ppp/pppol2tp.c @@ -217,6 +217,8 @@ static err_t pppol2tp_write(ppp_pcb *ppp, void *ctx, struct pbuf *p) { err_t ret; #if LWIP_SNMP u16_t tot_len; +#else /* LWIP_SNMP */ + LWIP_UNUSED_ARG(ppp); #endif /* LWIP_SNMP */ ph = pbuf_alloc(PBUF_TRANSPORT, (u16_t)(PPPOL2TP_OUTPUT_DATA_HEADER_LEN), PBUF_RAM); @@ -252,10 +254,12 @@ static err_t pppol2tp_netif_output(ppp_pcb *ppp, void *ctx, struct pbuf *p, u_sh pppol2tp_pcb *l2tp = (pppol2tp_pcb *)ctx; struct pbuf *pb; u8_t *pl; + err_t err; #if LWIP_SNMP u16_t tot_len; +#else /* LWIP_SNMP */ + LWIP_UNUSED_ARG(ppp); #endif /* LWIP_SNMP */ - err_t err; /* @todo: try to use pbuf_header() here! */ pb = pbuf_alloc(PBUF_TRANSPORT, PPPOL2TP_OUTPUT_DATA_HEADER_LEN + sizeof(protocol), PBUF_RAM); diff --git a/src/netif/ppp/pppos.c b/src/netif/ppp/pppos.c index ddb3b7ff..9d474ca8 100644 --- a/src/netif/ppp/pppos.c +++ b/src/netif/ppp/pppos.c @@ -1005,7 +1005,9 @@ pppos_output_append(pppos_pcb *pppos, err_t err, struct pbuf *nb, u8_t c, u8_t a static err_t pppos_output_last(pppos_pcb *pppos, err_t err, struct pbuf *nb, u16_t *fcs) { +#if LWIP_SNMP ppp_pcb *ppp = pppos->ppp; +#endif /* LWIP_SNMP */ /* Add FCS and trailing flag. */ err = pppos_output_append(pppos, err, nb, ~(*fcs) & 0xFF, 1, NULL);