diff options
| author | Bjoern A. Zeeb <bz@FreeBSD.org> | 2007-07-05 08:53:21 +0000 |
|---|---|---|
| committer | Bjoern A. Zeeb <bz@FreeBSD.org> | 2007-07-05 08:53:21 +0000 |
| commit | 7089081d49a8d4f993c9821fefef5a0354aad48e (patch) | |
| tree | 37092ce619caaf0ca41c37c5227c7c6081931d72 /sys/i4b/layer4/i4b_l4.c | |
| parent | a031fd450e18b3c29ecddecd0f3dcefa9c786d3b (diff) | |
Fix a build breakage as result of disabling parts of I4B.
Check for (temporary gone) kernel options to be defined before using
them.
Reported by: peter
Approved by: re (rwatson)
Notes
Notes:
svn path=/head/; revision=171244
Diffstat (limited to 'sys/i4b/layer4/i4b_l4.c')
| -rw-r--r-- | sys/i4b/layer4/i4b_l4.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sys/i4b/layer4/i4b_l4.c b/sys/i4b/layer4/i4b_l4.c index 9cdd3e1c5d32..4da56c35333d 100644 --- a/sys/i4b/layer4/i4b_l4.c +++ b/sys/i4b/layer4/i4b_l4.c @@ -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; |