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

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

Diff for /src/sys/net/if_tap.c between version 1.79 and 1.80

version 1.79, 2014/10/03 06:46:02 version 1.80, 2014/11/07 09:26:08
Line 275  tap_attach(device_t parent, device_t sel
Line 275  tap_attach(device_t parent, device_t sel
         sc->sc_sih = NULL;          sc->sc_sih = NULL;
         getnanotime(&sc->sc_btime);          getnanotime(&sc->sc_btime);
         sc->sc_atime = sc->sc_mtime = sc->sc_btime;          sc->sc_atime = sc->sc_mtime = sc->sc_btime;
           sc->sc_flags = 0;
           selinit(&sc->sc_rsel);
   
           /*
            * Initialize the two locks for the device.
            *
            * We need a lock here because even though the tap device can be
            * opened only once, the file descriptor might be passed to another
            * process, say a fork(2)ed child.
            *
            * The Giant saves us from most of the hassle, but since the read
            * operation can sleep, we don't want two processes to wake up at
            * the same moment and both try and dequeue a single packet.
            *
            * The queue for event listeners (used by kqueue(9), see below) has
            * to be protected too, so use a spin lock.
            */
           mutex_init(&sc->sc_rdlock, MUTEX_DEFAULT, IPL_NONE);
           mutex_init(&sc->sc_kqlock, MUTEX_DEFAULT, IPL_VM);
   
         if (!pmf_device_register(self, NULL, NULL))          if (!pmf_device_register(self, NULL, NULL))
                 aprint_error_dev(self, "couldn't establish power handler\n");                  aprint_error_dev(self, "couldn't establish power handler\n");
Line 327  tap_attach(device_t parent, device_t sel
Line 346  tap_attach(device_t parent, device_t sel
         if_attach(ifp);          if_attach(ifp);
         ether_ifattach(ifp, enaddr);          ether_ifattach(ifp, enaddr);
   
         sc->sc_flags = 0;  
   
 #if defined(COMPAT_40) || defined(MODULAR)  #if defined(COMPAT_40) || defined(MODULAR)
         /*          /*
          * Add a sysctl node for that interface.           * Add a sysctl node for that interface.
Line 353  tap_attach(device_t parent, device_t sel
Line 370  tap_attach(device_t parent, device_t sel
                 aprint_error_dev(self, "sysctl_createv returned %d, ignoring\n",                  aprint_error_dev(self, "sysctl_createv returned %d, ignoring\n",
                     error);                      error);
 #endif  #endif
   
         /*  
          * Initialize the two locks for the device.  
          *  
          * We need a lock here because even though the tap device can be  
          * opened only once, the file descriptor might be passed to another  
          * process, say a fork(2)ed child.  
          *  
          * The Giant saves us from most of the hassle, but since the read  
          * operation can sleep, we don't want two processes to wake up at  
          * the same moment and both try and dequeue a single packet.  
          *  
          * The queue for event listeners (used by kqueue(9), see below) has  
          * to be protected too, so use a spin lock.  
          */  
         mutex_init(&sc->sc_rdlock, MUTEX_DEFAULT, IPL_NONE);  
         mutex_init(&sc->sc_kqlock, MUTEX_DEFAULT, IPL_VM);  
   
         selinit(&sc->sc_rsel);  
 }  }
   
 /*  /*
Legend:
Removed from v.1.79  
changed lines
  Added in v.1.80
CVSweb <webmaster@jp.NetBSD.org>