[Olsr-cvs] olsrd-current/src scheduler.c,1.40,1.41

[Bernd Petrovitsch]

Update of /cvsroot/olsrd/olsrd-current/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3745/src

Modified Files:
	scheduler.c 
Log Message:
* killed an unnecessary static variable

Index: scheduler.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/scheduler.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** scheduler.c	17 Jul 2007 09:28:15 -0000	1.40
--- scheduler.c	2 Aug 2007 12:24:37 -0000	1.41
***************
*** 63,68 ****
  struct tm *nowtm;		/* current idea of time (in tm) */
  
- static float pollrate;
- 
  /* Lists */
  static struct timeout_entry *timeout_functions;
--- 63,66 ----
***************
*** 127,137 ****
      olsr_register_scheduler_event(trigger_dijkstra, NULL, olsr_cnf->lq_dinter, 0, NULL);
  
!   pollrate = olsr_cnf->pollrate;
!   interval_usec = (olsr_u32_t)(pollrate * 1000000);
  
    interval.tv_sec = interval_usec / 1000000;
    interval.tv_usec = interval_usec % 1000000;
  
!   OLSR_PRINTF(1, "Scheduler started - polling every %0.2f seconds\n", pollrate);
    OLSR_PRINTF(3, "Max jitter is %f\n\n", olsr_cnf->max_jitter);
  
--- 125,134 ----
      olsr_register_scheduler_event(trigger_dijkstra, NULL, olsr_cnf->lq_dinter, 0, NULL);
  
!   interval_usec = (olsr_u32_t)(olsr_cnf->pollrate * 1000000);
  
    interval.tv_sec = interval_usec / 1000000;
    interval.tv_usec = interval_usec % 1000000;
  
!   OLSR_PRINTF(1, "Scheduler started - polling every %0.2f seconds\n", olsr_cnf->pollrate);
    OLSR_PRINTF(3, "Max jitter is %f\n\n", olsr_cnf->max_jitter);
  
***************
*** 182,186 ****
        while(entry)
  	{
! 	  entry->since_last += pollrate;
  
  	  /* Timed out */
--- 179,183 ----
        while(entry)
  	{
! 	  entry->since_last += olsr_cnf->pollrate;
  
  	  /* Timed out */