abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2025-12-11 09:16:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

removed multilink option when multilink support is not compiled

Browse Source
This commit is contained in:
Sylvain Rochet 2012-06-09 14:14:06 +02:00
parent 2ec79c03a0
commit 552589f098
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/netif/ppp/lcp.c
View File

@ -741,11 +741,15 @@ lcp_resetci(f)
wo->magicnumber = magic(); wo->magicnumber = magic();
wo->numloops = 0; wo->numloops = 0;
*go = *wo; *go = *wo;
#ifdef HAVE_MULTILINK
if (!multilink) { if (!multilink) {
#endif /* HAVE_MULTILINK */
go->neg_mrru = 0; go->neg_mrru = 0;
go->neg_ssnhf = 0; go->neg_ssnhf = 0;
go->neg_endpoint = 0; go->neg_endpoint = 0;
#ifdef HAVE_MULTILINK
} }
#endif /* HAVE_MULTILINK */
if (noendpoint) if (noendpoint)
ao->neg_endpoint = 0; ao->neg_endpoint = 0;
peer_mru[f->unit] = PPP_MRU; peer_mru[f->unit] = PPP_MRU;
@ -2165,8 +2169,11 @@ lcp_reqci(f, inp, lenp, reject_if_disagree)
break; break;
case CI_MRRU: case CI_MRRU:
if (!ao->neg_mrru || !multilink || if (!ao->neg_mrru
cilen != CILEN_SHORT) { #ifdef HAVE_MULTILINK
|| !multilink
#endif /* HAVE_MULTILINK */
|| cilen != CILEN_SHORT) {
orc = CONFREJ; orc = CONFREJ;
break; break;
} }
@ -2178,8 +2185,11 @@ lcp_reqci(f, inp, lenp, reject_if_disagree)
break; break;
case CI_SSNHF: case CI_SSNHF:
if (!ao->neg_ssnhf || !multilink || if (!ao->neg_ssnhf
cilen != CILEN_VOID) { #ifdef HAVE_MULTILINK
|| !multilink
#endif /* HAVE_MULTILINK */
|| cilen != CILEN_VOID) {
orc = CONFREJ; orc = CONFREJ;
break; break;
} }

2
src/netif/ppp/options.c
View File

@ -121,7 +121,9 @@ char linkname[MAXPATHLEN]; /* logical name for link */
bool tune_kernel; /* may alter kernel settings */ bool tune_kernel; /* may alter kernel settings */
int connect_delay = 1000; /* wait this many ms after connect script */ int connect_delay = 1000; /* wait this many ms after connect script */
int req_unit = -1; /* requested interface unit */ int req_unit = -1; /* requested interface unit */
#if 0
bool multilink = 0; /* Enable multilink operation */ bool multilink = 0; /* Enable multilink operation */
#endif
char *bundle_name = NULL; /* bundle name for multilink */ char *bundle_name = NULL; /* bundle name for multilink */
bool dump_options; /* print out option values */ bool dump_options; /* print out option values */
#if 0 #if 0