mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-16 15:11:52 +00:00
Code Issues Releases Activity

Fix a build breakage as result of disabling parts of I4B.

Browse Source 
Check for (temporary gone) kernel options to be defined before using
them.

Reported by:	peter
Approved by:	re (rwatson)
This commit is contained in:
Bjoern A. Zeeb 2007-07-05 08:53:21 +00:00
parent a031fd450e
commit 7089081d49
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=171244
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/i4b/layer4/i4b_i4bdrv.c
View File

@ -423,19 +423,19 @@ i4bioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td
switch(mdrsp->driver)
{
#if NI4BIPR > 0
#if defined(NI4BIPR) && (NI4BIPR > 0)
case BDRV_IPR:
dlt = ipr_ret_linktab(mdrsp->driver_unit);
break;
#endif
#if NI4BISPPP > 0
#if defined(NI4BISPPP) && (NI4BISPPP > 0)
case BDRV_ISPPP:
dlt = i4bisppp_ret_linktab(mdrsp->driver_unit);
break;
#endif
#if NI4BTEL > 0
#if defined(NI4BTEL) && (NI4BTEL > 0)
case BDRV_TEL:
dlt = tel_ret_linktab(mdrsp->driver_unit);
break;
@ -447,7 +447,7 @@ i4bioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td
break;
#endif
#if NI4BING > 0
#if defined(NI4BING) && (NI4BING > 0)
case BDRV_ING:
dlt = ing_ret_linktab(mdrsp->driver_unit);
break;
@ -543,7 +543,7 @@ i4bioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td
mui = (msg_updown_ind_t *)data;
#if NI4BIPR > 0
#if defined(NI4BIPR) && (NI4BIPR > 0)
if(mui->driver == BDRV_IPR)
{
drvr_link_t *dlt;

24
sys/i4b/layer4/i4b_l4.c
View File

@ -63,7 +63,7 @@ static void i4b_l4_setup_timeout_fix_unit(call_desc_t *cd);
static void i4b_l4_setup_timeout_var_unit(call_desc_t *cd);
static time_t i4b_get_idletime(call_desc_t *cd);
#if NI4BISPPP > 0
#if defined(NI4BISPPP) && (NI4BISPPP > 0)
extern time_t i4bisppp_idletime(int);
#endif
@ -621,25 +621,25 @@ i4b_link_bchandrvr(call_desc_t *cd)
switch(cd->driver)
{
#if NI4BRBCH > 0
#if defined(NI4BRBCH) && (NI4BRBCH > 0)
case BDRV_RBCH:
cd->dlt = rbch_ret_linktab(cd->driver_unit);
break;
#endif
#if NI4BTEL > 0
#if defined(NI4BTEL) && (NI4BTEL > 0)
case BDRV_TEL:
cd->dlt = tel_ret_linktab(cd->driver_unit);
break;
#endif
#if NI4BIPR > 0
#if defined(NI4BIPR) && (NI4BIPR > 0)
case BDRV_IPR:
cd->dlt = ipr_ret_linktab(cd->driver_unit);
break;
#endif
#if NI4BISPPP > 0
#if defined(NI4BISPPP) && (NI4BISPPP > 0)
case BDRV_ISPPP:
cd->dlt = i4bisppp_ret_linktab(cd->driver_unit);
break;
@ -651,7 +651,7 @@ i4b_link_bchandrvr(call_desc_t *cd)
break;
#endif
#if NI4BING > 0
#if defined(NI4BING) && (NI4BING > 0)
case BDRV_ING:
cd->dlt = ing_ret_linktab(cd->driver_unit);
break;
@ -675,25 +675,25 @@ i4b_link_bchandrvr(call_desc_t *cd)
switch(cd->driver)
{
#if NI4BRBCH > 0
#if defined(NI4BRBCH) && (NI4BRBCH > 0)
case BDRV_RBCH:
rbch_set_linktab(cd->driver_unit, cd->ilt);
break;
#endif
#if NI4BTEL > 0
#if defined(NI4BTEL) && (NI4BTEL > 0)
case BDRV_TEL:
tel_set_linktab(cd->driver_unit, cd->ilt);
break;
#endif
#if NI4BIPR > 0
#if defined(NI4BIPR) && (NI4BIPR > 0)
case BDRV_IPR:
ipr_set_linktab(cd->driver_unit, cd->ilt);
break;
#endif
#if NI4BISPPP > 0
#if defined(NI4BISPPP) && (NI4BISPPP > 0)
case BDRV_ISPPP:
i4bisppp_set_linktab(cd->driver_unit, cd->ilt);
break;
@ -705,7 +705,7 @@ i4b_link_bchandrvr(call_desc_t *cd)
break;
#endif
#if NI4BING > 0
#if defined(NI4BING) && (NI4BING > 0)
case BDRV_ING:
ing_set_linktab(cd->driver_unit, cd->ilt);
break;
@ -794,7 +794,7 @@ static time_t
i4b_get_idletime(call_desc_t *cd)
{
switch (cd->driver) {
#if NI4BISPPP > 0
#if defined(NI4BISPPP) && (NI4BISPPP > 0)
case BDRV_ISPPP:
return i4bisppp_idletime(cd->driver_unit);
break;