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

ifma_protospec is a pointer. Use NULL when assigning or compating it.

Browse Source
This commit is contained in:
Gleb Smirnoff 2005-03-20 14:31:45 +00:00
parent 1897c44125
commit d4d2297060
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/net/if.c
View File

@ -1744,7 +1744,7 @@ if_addmulti(struct ifnet *ifp, struct sockaddr *sa, struct ifmultiaddr **retifma
ifma->ifma_lladdr = llsa; ifma->ifma_lladdr = llsa;
ifma->ifma_ifp = ifp; ifma->ifma_ifp = ifp;
ifma->ifma_refcount = 1; ifma->ifma_refcount = 1;
ifma->ifma_protospec = 0; ifma->ifma_protospec = NULL;
rt_newmaddrmsg(RTM_NEWMADDR, ifma); rt_newmaddrmsg(RTM_NEWMADDR, ifma);
/* /*
@ -1774,7 +1774,7 @@ if_addmulti(struct ifnet *ifp, struct sockaddr *sa, struct ifmultiaddr **retifma
ifma->ifma_lladdr = NULL; ifma->ifma_lladdr = NULL;
ifma->ifma_ifp = ifp; ifma->ifma_ifp = ifp;
ifma->ifma_refcount = 1; ifma->ifma_refcount = 1;
ifma->ifma_protospec = 0; ifma->ifma_protospec = NULL;
s = splimp(); s = splimp();
TAILQ_INSERT_HEAD(&ifp->if_multiaddrs, ifma, ifma_link); TAILQ_INSERT_HEAD(&ifp->if_multiaddrs, ifma, ifma_link);
splx(s); splx(s);

4
sys/netinet/in.c
View File

@ -958,7 +958,7 @@ in_addmulti(ap, ifp)
* If ifma->ifma_protospec is null, then if_addmulti() created * If ifma->ifma_protospec is null, then if_addmulti() created
* a new record. Otherwise, we are done. * a new record. Otherwise, we are done.
*/ */
if (ifma->ifma_protospec != 0) { if (ifma->ifma_protospec != NULL) {
splx(s); splx(s);
return ifma->ifma_protospec; return ifma->ifma_protospec;
} }
@ -1006,7 +1006,7 @@ in_delmulti(inm)
* the interface and nuke the packet. * the interface and nuke the packet.
*/ */
my_inm = *inm ; my_inm = *inm ;
ifma->ifma_protospec = 0; ifma->ifma_protospec = NULL;
LIST_REMOVE(inm, inm_link); LIST_REMOVE(inm, inm_link);
free(inm, M_IPMADDR); free(inm, M_IPMADDR);
} }

4
sys/netinet6/mld6.c
View File

@ -510,7 +510,7 @@ in6_addmulti(maddr6, ifp, errorp)
* If ifma->ifma_protospec is null, then if_addmulti() created * If ifma->ifma_protospec is null, then if_addmulti() created
* a new record. Otherwise, we are done. * a new record. Otherwise, we are done.
*/ */
if (ifma->ifma_protospec != 0) { if (ifma->ifma_protospec != NULL) {
splx(s); splx(s);
return ifma->ifma_protospec; return ifma->ifma_protospec;
} }
@ -556,7 +556,7 @@ in6_delmulti(in6m)
* that we are leaving the multicast group. * that we are leaving the multicast group.
*/ */
mld6_stop_listening(in6m); mld6_stop_listening(in6m);
ifma->ifma_protospec = 0; ifma->ifma_protospec = NULL;
LIST_REMOVE(in6m, in6m_entry); LIST_REMOVE(in6m, in6m_entry);
free(in6m, M_IPMADDR); free(in6m, M_IPMADDR);
} }