PPP, remove now unused ioctl callback from link_callbacks structure

This commit is contained in:
Sylvain Rochet 2015-09-13 17:59:14 +02:00
parent b55412a0c4
commit 5b07569eb9
5 changed files with 2 additions and 20 deletions

View File

@ -151,8 +151,6 @@ struct link_callbacks {
void (*send_config)(ppp_pcb *pcb, void *ctx, u32_t accm, int pcomp, int accomp); void (*send_config)(ppp_pcb *pcb, void *ctx, u32_t accm, int pcomp, int accomp);
/* confire the receive-side characteristics of the PPP interface */ /* confire the receive-side characteristics of the PPP interface */
void (*recv_config)(ppp_pcb *pcb, void *ctx, u32_t accm, int pcomp, int accomp); void (*recv_config)(ppp_pcb *pcb, void *ctx, u32_t accm, int pcomp, int accomp);
/* Get and set parameters for the given connection. */
err_t (*ioctl)(ppp_pcb *pcb, void *ctx, int cmd, void *arg);
}; };
/* /*

View File

@ -388,9 +388,7 @@ ppp_ioctl(ppp_pcb *pcb, u8_t cmd, void *arg)
return ERR_OK; return ERR_OK;
default: default:
if (pcb->link_cb->ioctl) { goto fail;
return pcb->link_cb->ioctl(pcb, pcb->link_ctx_cb, cmd, arg);
}
} }
fail: fail:

View File

@ -156,7 +156,6 @@ static const struct link_callbacks pppoe_callbacks = {
pppoe_write, pppoe_write,
pppoe_netif_output, pppoe_netif_output,
NULL, NULL,
NULL,
NULL NULL
}; };

View File

@ -107,7 +107,6 @@ static const struct link_callbacks pppol2tp_callbacks = {
pppol2tp_write, pppol2tp_write,
pppol2tp_netif_output, pppol2tp_netif_output,
NULL, NULL,
NULL,
NULL NULL
}; };

View File

@ -61,7 +61,6 @@ static void pppos_disconnect(ppp_pcb *ppp, void *ctx);
static err_t pppos_destroy(ppp_pcb *ppp, void *ctx); static err_t pppos_destroy(ppp_pcb *ppp, void *ctx);
static void pppos_send_config(ppp_pcb *ppp, void *ctx, u32_t accm, int pcomp, int accomp); static void pppos_send_config(ppp_pcb *ppp, void *ctx, u32_t accm, int pcomp, int accomp);
static void pppos_recv_config(ppp_pcb *ppp, void *ctx, u32_t accm, int pcomp, int accomp); static void pppos_recv_config(ppp_pcb *ppp, void *ctx, u32_t accm, int pcomp, int accomp);
static err_t pppos_ioctl(ppp_pcb *pcb, void *ctx, int cmd, void *arg);
/* Prototypes for procedures local to this file. */ /* Prototypes for procedures local to this file. */
#if PPP_INPROC_IRQ_SAFE #if PPP_INPROC_IRQ_SAFE
@ -83,8 +82,7 @@ static const struct link_callbacks pppos_callbacks = {
pppos_write, pppos_write,
pppos_netif_output, pppos_netif_output,
pppos_send_config, pppos_send_config,
pppos_recv_config, pppos_recv_config
pppos_ioctl
}; };
/* PPP's Asynchronous-Control-Character-Map. The mask array is used /* PPP's Asynchronous-Control-Character-Map. The mask array is used
@ -782,16 +780,6 @@ pppos_recv_config(ppp_pcb *ppp, void *ctx, u32_t accm, int pcomp, int accomp)
pppos->in_accm[0], pppos->in_accm[1], pppos->in_accm[2], pppos->in_accm[3])); pppos->in_accm[0], pppos->in_accm[1], pppos->in_accm[2], pppos->in_accm[3]));
} }
static err_t
pppos_ioctl(ppp_pcb *pcb, void *ctx, int cmd, void *arg)
{
LWIP_UNUSED_ARG(pcb);
LWIP_UNUSED_ARG(ctx);
LWIP_UNUSED_ARG(cmd);
LWIP_UNUSED_ARG(arg);
return ERR_VAL;
}
/* /*
* Drop the input packet. * Drop the input packet.
*/ */