[Olsr-cvs] olsrd-current/src interfaces.h,1.48,1.49

[Bernd Petrovitsch]

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

Modified Files:
	interfaces.h 
Log Message:
* applied bsdfix_pwm.diff.txt from Patrick McCarty <(spam-protected)> so that *BSD compiles and runs

Index: interfaces.h
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/interfaces.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** interfaces.h	25 Nov 2007 22:02:33 -0000	1.48
--- interfaces.h	29 Nov 2007 17:09:16 -0000	1.49
***************
*** 73,96 ****
  #define MAX_IF_METRIC           100
  
! #if 0
! enum olsr_if_weight
!   {
!     WEIGHT_LOWEST = 0,
!     WEIGHT_LOW,
!     WEIGHT_ETHERNET_1GBP,     /* Ethernet 1Gb+        */
!     WEIGHT_ETHERNET_1GB,      /* Ethernet 1Gb         */
!     WEIGHT_ETHERNET_100MB,    /* Ethernet 100Mb       */
!     WEIGHT_ETHERNET_10MB,     /* Ethernet 10Mb        */
!     WEIGHT_ETHERNET_DEFAULT,  /* Ethernet unknown rate*/
!     WEIGHT_WLAN_HIGH,         /* >54Mb WLAN           */
!     WEIGHT_WLAN_54MB,         /* 54Mb 802.11g         */
!     WEIGHT_WLAN_11MB,         /* 11Mb 802.11b         */
!     WEIGHT_WLAN_LOW,          /* <11Mb WLAN           */
!     WEIGHT_WLAN_DEFAULT,      /* WLAN unknown rate    */
!     WEIGHT_SERIAL,            /* Serial device        */
!     WEIGHT_HIGH,              /* Max                  */
!     WEIGHT_HIGHEST = WEIGHT_HIGH
!   };
! #endif
  
  struct if_gen_property
--- 73,91 ----
  #define MAX_IF_METRIC           100
  
! #define WEIGHT_LOWEST           0       /* No weight            */
! #define WEIGHT_LOW              1       /* Low                  */
! #define WEIGHT_ETHERNET_1GBP    2       /* Ethernet 1Gb+        */
! #define WEIGHT_ETHERNET_1GB     4       /* Ethernet 1Gb         */
! #define WEIGHT_ETHERNET_100MB   8       /* Ethernet 100Mb       */
! #define WEIGHT_ETHERNET_10MB    16      /* Ethernet 10Mb        */
! #define WEIGHT_ETHERNET_DEFAULT 32      /* Ethernet unknown rate*/
! #define WEIGHT_WLAN_HIGH        64      /* >54Mb WLAN           */
! #define WEIGHT_WLAN_54MB        128     /* 54Mb 802.11g         */
! #define WEIGHT_WLAN_11MB        256     /* 11Mb 802.11b         */
! #define WEIGHT_WLAN_LOW         512     /* <11Mb WLAN           */
! #define WEIGHT_WLAN_DEFAULT     1024    /* WLAN unknown rate    */
! #define WEIGHT_SERIAL           2048    /* Serial device        */
! #define WEIGHT_HIGH             4096    /* High                 */
! #define WEIGHT_HIGHEST          8192    /* Really high          */
  
  struct if_gen_property