From ec362536f5ed29ba795ced9319b6edd853dbeed0 Mon Sep 17 00:00:00 2001
From: Sylvain Rochet <gradator@gradator.net>
Date: Thu, 19 Feb 2015 23:51:33 +0100
Subject: [PATCH] PPP, uniformised callbacks naming

---
 src/netif/ppp/pppoe.c    | 12 ++++++------
 src/netif/ppp/pppol2tp.c | 12 ++++++------
 src/netif/ppp/pppos.c    | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/netif/ppp/pppoe.c b/src/netif/ppp/pppoe.c
index 6f79c03e..703c7ca8 100644
--- a/src/netif/ppp/pppoe.c
+++ b/src/netif/ppp/pppoe.c
@@ -117,8 +117,8 @@ static char pppoe_error_tmp[PPPOE_ERRORSTRING_LEN];
 
 
 /* callbacks called from PPP core */
-static err_t pppoe_link_write_callback(ppp_pcb *ppp, void *ctx, struct pbuf *p);
-static err_t pppoe_link_netif_output_callback(ppp_pcb *ppp, void *ctx, struct pbuf *p, u_short protocol);
+static err_t pppoe_write(ppp_pcb *ppp, void *ctx, struct pbuf *p);
+static err_t pppoe_netif_output(ppp_pcb *ppp, void *ctx, struct pbuf *p, u_short protocol);
 static err_t pppoe_connect(ppp_pcb *ppp, void *ctx);
 static void pppoe_disconnect(ppp_pcb *ppp, void *ctx);
 static err_t pppoe_destroy(ppp_pcb *ppp, void *ctx);
@@ -152,8 +152,8 @@ static const struct link_callbacks pppoe_callbacks = {
   pppoe_connect,
   pppoe_disconnect,
   pppoe_destroy,
-  pppoe_link_write_callback,
-  pppoe_link_netif_output_callback,
+  pppoe_write,
+  pppoe_netif_output,
   NULL,
   NULL,
   NULL
@@ -201,7 +201,7 @@ ppp_pcb *pppoe_create(struct netif *pppif,
 }
 
 /* Called by PPP core */
-static err_t pppoe_link_write_callback(ppp_pcb *ppp, void *ctx, struct pbuf *p) {
+static err_t pppoe_write(ppp_pcb *ppp, void *ctx, struct pbuf *p) {
   struct pppoe_softc *sc = (struct pppoe_softc *)ctx;
   struct pbuf *ph; /* Ethernet + PPPoE header */
 #if LWIP_SNMP
@@ -241,7 +241,7 @@ static err_t pppoe_link_write_callback(ppp_pcb *ppp, void *ctx, struct pbuf *p)
 }
 
 /* Called by PPP core */
-static err_t pppoe_link_netif_output_callback(ppp_pcb *ppp, void *ctx, struct pbuf *p, u_short protocol) {
+static err_t pppoe_netif_output(ppp_pcb *ppp, void *ctx, struct pbuf *p, u_short protocol) {
   struct pppoe_softc *sc = (struct pppoe_softc *)ctx;
   struct pbuf *pb;
   int i=0;
diff --git a/src/netif/ppp/pppol2tp.c b/src/netif/ppp/pppol2tp.c
index 493a4133..9c55fc94 100644
--- a/src/netif/ppp/pppol2tp.c
+++ b/src/netif/ppp/pppol2tp.c
@@ -75,8 +75,8 @@
 #endif /* PPPOL2TP_AUTH_SUPPORT */
 
 /* callbacks called from PPP core */
-static err_t pppol2tp_link_write_callback(ppp_pcb *ppp, void *ctx, struct pbuf *p);
-static err_t pppol2tp_link_netif_output_callback(ppp_pcb *ppp, void *ctx, struct pbuf *p, u_short protocol);
+static err_t pppol2tp_write(ppp_pcb *ppp, void *ctx, struct pbuf *p);
+static err_t pppol2tp_netif_output(ppp_pcb *ppp, void *ctx, struct pbuf *p, u_short protocol);
 static err_t pppol2tp_destroy(ppp_pcb *ppp, void *ctx);    /* Destroy a L2TP control block */
 static err_t pppol2tp_connect(ppp_pcb *ppp, void *ctx);    /* Be a LAC, connect to a LNS. */
 static void pppol2tp_disconnect(ppp_pcb *ppp, void *ctx);  /* Disconnect */
@@ -101,8 +101,8 @@ static const struct link_callbacks pppol2tp_callbacks = {
   pppol2tp_connect,
   pppol2tp_disconnect,
   pppol2tp_destroy,
-  pppol2tp_link_write_callback,
-  pppol2tp_link_netif_output_callback,
+  pppol2tp_write,
+  pppol2tp_netif_output,
   NULL,
   NULL,
   NULL
@@ -154,7 +154,7 @@ ppp_pcb *pppol2tp_create(struct netif *pppif,
 }
 
 /* Called by PPP core */
-static err_t pppol2tp_link_write_callback(ppp_pcb *ppp, void *ctx, struct pbuf *p) {
+static err_t pppol2tp_write(ppp_pcb *ppp, void *ctx, struct pbuf *p) {
   pppol2tp_pcb *l2tp = (pppol2tp_pcb *)ctx;
   struct pbuf *ph; /* UDP + L2TP header */
 #if LWIP_SNMP
@@ -191,7 +191,7 @@ static err_t pppol2tp_link_write_callback(ppp_pcb *ppp, void *ctx, struct pbuf *
 }
 
 /* Called by PPP core */
-static err_t pppol2tp_link_netif_output_callback(ppp_pcb *ppp, void *ctx, struct pbuf *p, u_short protocol) {
+static err_t pppol2tp_netif_output(ppp_pcb *ppp, void *ctx, struct pbuf *p, u_short protocol) {
   pppol2tp_pcb *l2tp = (pppol2tp_pcb *)ctx;
   struct pbuf *pb;
   int i=0;
diff --git a/src/netif/ppp/pppos.c b/src/netif/ppp/pppos.c
index 1406eea7..f681d73e 100644
--- a/src/netif/ppp/pppos.c
+++ b/src/netif/ppp/pppos.c
@@ -82,8 +82,8 @@ static u8_t pppos_exist(pppos_pcb *pppos);
 #endif /* PPPOS_PCB_LIST */
 
 /* callbacks called from PPP core */
-static err_t pppos_link_write_callback(ppp_pcb *ppp, void *ctx, struct pbuf *p);
-static err_t pppos_link_netif_output_callback(ppp_pcb *ppp, void *ctx, struct pbuf *pb, u_short protocol);
+static err_t pppos_write(ppp_pcb *ppp, void *ctx, struct pbuf *p);
+static err_t pppos_netif_output(ppp_pcb *ppp, void *ctx, struct pbuf *pb, u_short protocol);
 static err_t pppos_connect(ppp_pcb *ppp, void *ctx);
 static void pppos_disconnect(ppp_pcb *ppp, void *ctx);
 static err_t pppos_destroy(ppp_pcb *ppp, void *ctx);
@@ -107,8 +107,8 @@ static const struct link_callbacks pppos_callbacks = {
   pppos_connect,
   pppos_disconnect,
   pppos_destroy,
-  pppos_link_write_callback,
-  pppos_link_netif_output_callback,
+  pppos_write,
+  pppos_netif_output,
   pppos_send_config,
   pppos_recv_config,
 #if VJ_SUPPORT
@@ -226,7 +226,7 @@ ppp_pcb *pppos_create(struct netif *pppif, sio_fd_t fd,
 
 /* Called by PPP core */
 static err_t
-pppos_link_write_callback(ppp_pcb *ppp, void *ctx, struct pbuf *p)
+pppos_write(ppp_pcb *ppp, void *ctx, struct pbuf *p)
 {
   pppos_pcb *pppos = (pppos_pcb *)ctx;
   u_char *s = (u_char*)p->payload;
@@ -295,7 +295,7 @@ pppos_link_write_callback(ppp_pcb *ppp, void *ctx, struct pbuf *p)
 
 /* Called by PPP core */
 static err_t
-pppos_link_netif_output_callback(ppp_pcb *ppp, void *ctx, struct pbuf *pb, u_short protocol)
+pppos_netif_output(ppp_pcb *ppp, void *ctx, struct pbuf *pb, u_short protocol)
 {
   pppos_pcb *pppos = (pppos_pcb *)ctx;
   u_int fcs_out = PPP_INITFCS;