d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When it's necessary to kldload tun(4), don't forget to re-try to open

Browse Source 
tun0.

Submitted by:	qhwt@myrealbox.com
This commit is contained in:
Brian Somers 2002-04-15 00:14:40 +00:00
parent 39606b2e27
commit 5476d2e5aa
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=94698
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr.sbin/ppp/bundle.c
View File

@ -708,10 +708,11 @@ bundle_Create(const char *prefix, int type, int unit)
#if defined(__FreeBSD__) && !defined(NOKLDLOAD)
if (bundle.unit == minunit && !kldtried++) {
/*
* Attempt to load the tunnel interface KLD if it isn't loaded
* already.
* Attempt to load the tunnel interface KLD if it isn't loaded
* already.
*/
loadmodules(LOAD_VERBOSLY, "if_tun", NULL);
if (loadmodules(LOAD_VERBOSLY, "if_tun", NULL))
bundle.unit--;
continue;
}
#endif

14
usr.sbin/ppp/defs.c
View File

@ -420,19 +420,25 @@ Concatinate(char *buf, size_t sz, int argc, const char *const *argv)
}
}
void
int
loadmodules(int how, const char *module, ...)
{
int loaded = 0;
#if defined(__FreeBSD__) && !defined(NOKLDLOAD)
va_list ap;
va_start(ap, module);
while (module != NULL) {
if (modfind(module) == -1 && ID0kldload(module) == -1 &&
how == LOAD_VERBOSLY)
log_Printf(LogWARN, "%s: Cannot load module\n", module);
if (modfind(module) == -1) {
if (ID0kldload(module) == -1) {
if (how == LOAD_VERBOSLY)
log_Printf(LogWARN, "%s: Cannot load module\n", module);
} else
loaded++;
}
module = va_arg(ap, const char *);
}
va_end(ap);
#endif
return loaded;
}

2
usr.sbin/ppp/defs.h
View File

@ -139,4 +139,4 @@ extern void SetTitle(const char *);
extern fd_set *mkfdset(void);
extern void zerofdset(fd_set *);
extern void Concatinate(char *, size_t, int, const char *const *);
extern void loadmodules(int, const char *, ...);
extern int loadmodules(int, const char *, ...);