PPP, remove VJ callback from link_callbacks if VJ support is not enabled

This commit is contained in:
Sylvain Rochet 2015-02-28 21:39:32 +01:00
parent 71b213df63
commit 89771de6d0
4 changed files with 6 additions and 2 deletions

View File

@ -155,8 +155,10 @@ struct link_callbacks {
void (*send_config)(ppp_pcb *pcb, void *ctx, u32_t accm);
/* confire the receive-side characteristics of the PPP interface */
void (*recv_config)(ppp_pcb *pcb, void *ctx, u32_t accm);
#if VJ_SUPPORT
/* configure TCP header compression */
void (*vj_config)(ppp_pcb *pcb, void *ctx, int vjcomp, int cidcomp, int maxcid);
#endif /* VJ_SUPPORT */
/* Get and set parameters for the given connection. */
err_t (*ioctl)(ppp_pcb *pcb, void *ctx, int cmd, void *arg);
/* Pass the processed input packet to the appropriate handler. */

View File

@ -156,7 +156,9 @@ static const struct link_callbacks pppoe_callbacks = {
pppoe_netif_output,
NULL,
NULL,
#if VJ_SUPPORT
NULL,
#endif /* VJ_SUPPORT */
NULL,
NULL
};

View File

@ -105,7 +105,9 @@ static const struct link_callbacks pppol2tp_callbacks = {
pppol2tp_netif_output,
NULL,
NULL,
#if VJ_SUPPORT
NULL,
#endif /* VJ_SUPPORT */
NULL,
NULL
};

View File

@ -84,8 +84,6 @@ static const struct link_callbacks pppos_callbacks = {
pppos_recv_config,
#if VJ_SUPPORT
pppos_vjc_config,
#else /* VJ_SUPPORT */
NULL,
#endif /* VJ_SUPPORT */
pppos_ioctl,
#if VJ_SUPPORT