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

Assign if_broadcastaddr to NULL not 0 in if_attach().

Browse Source 
Printf() a warning if if_attachdomain() is called more than once on an
  interface to generate some noise on mailing lists when this occurs.

Fix up style in if_start(), where spaces crept in instead of tabs at
some point.

MFC after:	1 week
MFC note:	Not the printf().
This commit is contained in:
rwatson 2004-11-23 23:31:33 +00:00
parent 410699c6a2
commit b523874cef
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/net/if.c
View File

@ -444,7 +444,7 @@ if_attach(struct ifnet *ifp)
sdl->sdl_data[--namelen] = 0xff;
ifa->ifa_refcnt = 1;
TAILQ_INSERT_HEAD(&ifp->if_addrhead, ifa, ifa_link);
ifp->if_broadcastaddr = 0; /* reliably crash if used uninitialized */
ifp->if_broadcastaddr = NULL; /* reliably crash if used uninitialized */
ifp->if_snd.altq_type = 0;
ifp->if_snd.altq_disc = NULL;
ifp->if_snd.altq_flags &= ALTQF_CANTCHANGE;
@ -493,6 +493,8 @@ if_attachdomain1(struct ifnet *ifp)
if (ifp->if_afdata_initialized) {
IF_AFDATA_UNLOCK(ifp);
splx(s);
printf("if_attachdomain called more than once on %s\n",
ifp->if_xname);
return;
}
ifp->if_afdata_initialized = 1;
@ -1920,15 +1922,15 @@ if_start(struct ifnet *ifp)
{
NET_ASSERT_GIANT();
if ((ifp->if_flags & IFF_NEEDSGIANT) != 0 && debug_mpsafenet != 0) {
if (mtx_owned(&Giant))
(*(ifp)->if_start)(ifp);
else
if ((ifp->if_flags & IFF_NEEDSGIANT) != 0 && debug_mpsafenet != 0) {
if (mtx_owned(&Giant))
(*(ifp)->if_start)(ifp);
else
taskqueue_enqueue(taskqueue_swi_giant,
&ifp->if_starttask);
} else
(*(ifp)->if_start)(ifp);
} else
(*(ifp)->if_start)(ifp);
}
static void