[Olsr-cvs] olsrd-current/src/unix ifnet.c,1.48,1.49

[Bernd Petrovitsch]

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

Modified Files:
	ifnet.c 
Log Message:
* killed if_nr in struct interface and index in struct olsr_if.
  Kudos to Jörg Pommnitz <(spam-protected)> for spotting this
  leftovers and a patch for the Unix part.


Index: ifnet.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/unix/ifnet.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** ifnet.c	25 Apr 2007 22:08:18 -0000	1.48
--- ifnet.c	13 May 2007 22:23:55 -0000	1.49
***************
*** 551,556 ****
    OLSR_PRINTF(1, "       Address:%s\n", olsr_ip_to_string(&iface->hemu_ip));
  
-   OLSR_PRINTF(1, "       Index:%d\n", iface->index);
- 
    OLSR_PRINTF(1, "       NB! This is a emulated interface\n       that does not exist in the kernel!\n");
  
--- 551,554 ----
***************
*** 566,572 ****
      }
  
-   /* setting the interfaces number*/
-   ifp->if_nr = iface->index;
- 
    ifp->int_mtu = OLSR_DEFAULT_MTU;
  
--- 564,567 ----
***************
*** 888,895 ****
    OLSR_PRINTF(1, "\tMetric: %d\n", ifs.int_metric);
  
-   /* setting the interfaces number*/
-   ifs.if_nr = iface->index;
- 
- 
    /* Get MTU */
    if (ioctl(olsr_cnf->ioctl_s, SIOCGIFMTU, &ifr) < 0)
--- 883,886 ----
***************
*** 908,912 ****
  
    olsr_syslog(OLSR_LOG_INFO, "Adding interface %s\n", iface->name);
!   OLSR_PRINTF(1, "\tIndex %d\n", ifs.if_nr);
  
    if(olsr_cnf->ip_version == AF_INET)
--- 899,903 ----
  
    olsr_syslog(OLSR_LOG_INFO, "Adding interface %s\n", iface->name);
!   OLSR_PRINTF(1, "\tIndex %d\n", ifs.if_index);
  
    if(olsr_cnf->ip_version == AF_INET)