diff options
| author | Sylvain Rochet <[email protected]> | 2018-12-18 22:18:42 +0100 |
|---|---|---|
| committer | Simon Goldschmidt <[email protected]> | 2019-02-26 16:26:21 +0100 |
| commit | ea2bb9cd5bd69ead648cf7db8056c830ba0c8822 (patch) | |
| tree | a26ee726478fcbeabee38a24cfec49c548603d88 | |
| parent | e6d05db86f968955db47aa260bfac90b68f12b83 (diff) | |
PPP, PPPoE: remove leftover from PPPOE_SCNAME_SUPPORT support
Stupid me managed to push a pending patch, remove it.
Signed-off-by: Sylvain Rochet <[email protected]>
(cherry picked from commit 48615984c78ed9ba7b0af3f4ddf8177aa7551891)
| -rw-r--r-- | src/0001-PPP-PPPoE-fix-build-when-PPPOE_SCNAME_SUPPORT-is-def.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/src/0001-PPP-PPPoE-fix-build-when-PPPOE_SCNAME_SUPPORT-is-def.patch b/src/0001-PPP-PPPoE-fix-build-when-PPPOE_SCNAME_SUPPORT-is-def.patch deleted file mode 100644 index 84461ba5..00000000 --- a/src/0001-PPP-PPPoE-fix-build-when-PPPOE_SCNAME_SUPPORT-is-def.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 96548ede2b9fcf077e579098b1db9ed397bc7032 Mon Sep 17 00:00:00 2001 -From: Jacob Kroon <[email protected]> -Date: Tue, 18 Dec 2018 22:08:03 +0100 -Subject: [PATCH] PPP, PPPoE: fix build when PPPOE_SCNAME_SUPPORT is defined -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -lwip/src/netif/ppp/pppoe.c:768:24: error: pointer targets in passing argument 1 of ‘strlen’ differ in signedness [-Werror=poin$ - l1 = (int)strlen(sc->sc_service_name); -lwip/src/netif/ppp/pppoe.c:772:24: error: pointer targets in passing argument 1 of ‘strlen’ differ in signedness [-Werror=poin$ - l2 = (int)strlen(sc->sc_concentrator_name); - -sc->sc_service_name and sc->sc_concentrator_name are best defined as -char* because there are passed to libc strings functions which expect -a char*. - -Signed-off-by: Sylvain Rochet <[email protected]> ---- - src/include/netif/ppp/pppoe.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/include/netif/ppp/pppoe.h b/src/include/netif/ppp/pppoe.h -index d5d8a164..e2d20a2b 100644 ---- a/src/include/netif/ppp/pppoe.h -+++ b/src/include/netif/ppp/pppoe.h -@@ -150,8 +150,8 @@ struct pppoe_softc { - u8_t sc_state; /* discovery phase or session connected */ - - #if PPPOE_SCNAME_SUPPORT -- u8_t *sc_service_name; /* if != NULL: requested name of service */ -- u8_t *sc_concentrator_name; /* if != NULL: requested concentrator id */ -+ char *sc_service_name; /* if != NULL: requested name of service */ -+ char *sc_concentrator_name; /* if != NULL: requested concentrator id */ - #endif /* PPPOE_SCNAME_SUPPORT */ - u8_t sc_ac_cookie[PPPOE_MAX_AC_COOKIE_LEN]; /* content of AC cookie we must echo back */ - u8_t sc_ac_cookie_len; /* length of cookie data */ --- -2.20.1 - |