[BACK]Return to mld6.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sys / netinet6

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sys/netinet6/mld6.c between version 1.72.2.3 and 1.74

version 1.72.2.3, 2017/01/07 08:56:51 version 1.74, 2016/08/01 03:15:31
Line 106  __KERNEL_RCSID(0, "$NetBSD$");
Line 106  __KERNEL_RCSID(0, "$NetBSD$");
   
 #ifdef _KERNEL_OPT  #ifdef _KERNEL_OPT
 #include "opt_inet.h"  #include "opt_inet.h"
 #include "opt_net_mpsafe.h"  
 #endif  #endif
   
 #include <sys/param.h>  #include <sys/param.h>
Line 790  in6_delmulti(struct in6_multi *in6m)
Line 789  in6_delmulti(struct in6_multi *in6m)
   
                 /* Tell mld_timeo we're halting the timer */                  /* Tell mld_timeo we're halting the timer */
                 in6m->in6m_timer = IN6M_TIMER_UNDEF;                  in6m->in6m_timer = IN6M_TIMER_UNDEF;
 #ifdef NET_MPSAFE  
                 callout_halt(&in6m->in6m_timer_ch, NULL);  
 #else  
                 callout_halt(&in6m->in6m_timer_ch, softnet_lock);                  callout_halt(&in6m->in6m_timer_ch, softnet_lock);
 #endif  
                 callout_destroy(&in6m->in6m_timer_ch);                  callout_destroy(&in6m->in6m_timer_ch);
   
                 free(in6m, M_IPMADDR);                  free(in6m, M_IPMADDR);

Legend:
Removed from v.1.72.2.3  
changed lines
  Added in v.1.74

CVSweb <webmaster@jp.NetBSD.org>