From 421582d747748e0387b29bc2ef94e43bbbff3003 Mon Sep 17 00:00:00 2001 From: Sylvain Rochet Date: Sun, 12 Apr 2015 21:09:15 +0200 Subject: [PATCH] PPP, MPPE, using err_t return for mppe_decompress --- src/include/netif/ppp/mppe.h | 2 +- src/netif/ppp/mppe.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/include/netif/ppp/mppe.h b/src/include/netif/ppp/mppe.h index b2a48c60..bdfd4e6c 100644 --- a/src/include/netif/ppp/mppe.h +++ b/src/include/netif/ppp/mppe.h @@ -136,7 +136,7 @@ int mppe_compress(void *arg, unsigned char *ibuf, unsigned char *obuf, int mppe_decomp_init(void *arg, unsigned char *options, int optlen, int unit, int hdrlen, int mru, int debug); void mppe_decomp_reset(void *arg); -int mppe_decompress(void *arg, struct pbuf **pb); +err_t mppe_decompress(void *arg, struct pbuf **pb); void mppe_incomp(void *arg, unsigned char *ibuf, int icnt); #endif /* MPPE_H */ diff --git a/src/netif/ppp/mppe.c b/src/netif/ppp/mppe.c index b72a13d7..b90879c7 100644 --- a/src/netif/ppp/mppe.c +++ b/src/netif/ppp/mppe.c @@ -368,7 +368,7 @@ void mppe_decomp_reset(void *arg) /* * Decompress (decrypt) an MPPE packet. */ -int +err_t mppe_decompress(void *arg, struct pbuf **pb) { struct ppp_mppe_state *state = (struct ppp_mppe_state *) arg; @@ -497,7 +497,7 @@ mppe_decompress(void *arg, struct pbuf **pb) /* good packet credit */ state->sanity_errors >>= 1; - return n0->tot_len; + return ERR_OK; } /*