vserver 1.9.5.x5

[linux-2.6.git] / net / irda / qos.c

diff --git a/net/irda/qos.c b/net/irda/qos.c
index b02d2db..288d468 100644 (file)
--- a/net/irda/qos.c
+++ b/net/irda/qos.c
@@ -96,6 +96,10 @@ static int irlap_param_additional_bofs(void *instance, irda_param_t *parm,
 static int irlap_param_min_turn_time(void *instance, irda_param_t *param, 
                                     int get);
 
+#ifndef CONFIG_IRDA_DYNAMIC_WINDOW
+static __u32 irlap_requested_line_capacity(struct qos_info *qos);
+#endif
+
 static __u32 min_turn_times[]  = { 10000, 5000, 1000, 500, 100, 50, 10, 0 }; /* us */
 static __u32 baud_rates[]      = { 2400, 9600, 19200, 38400, 57600, 115200, 576000, 
                                   1152000, 4000000, 16000000 };           /* bps */
@@ -211,17 +215,6 @@ static int msb_index (__u16 word)
        return index;
 }
 
-static inline __u32 byte_value(__u8 byte, __u32 *array) 
-{
-       int index;
-
-       ASSERT(array != NULL, return -1;);
-
-       index = msb_index(byte);
-
-       return index_value(index, array);
-}
-
 /*
  * Function value_lower_bits (value, array)
  *
@@ -344,7 +337,7 @@ EXPORT_SYMBOL(irda_init_max_qos_capabilies);
  *     Adjust QoS settings in case some values are not possible to use because
  *     of other settings
  */
-void irlap_adjust_qos_settings(struct qos_info *qos)
+static void irlap_adjust_qos_settings(struct qos_info *qos)
 {
        __u32 line_capacity;
        int index;
@@ -734,19 +727,22 @@ __u32 irlap_max_line_capacity(__u32 speed, __u32 max_turn_time)
        return line_capacity;
 }
 
-__u32 irlap_requested_line_capacity(struct qos_info *qos)
-{      __u32 line_capacity;
-       
-       line_capacity = qos->window_size.value * 
+#ifndef CONFIG_IRDA_DYNAMIC_WINDOW
+static __u32 irlap_requested_line_capacity(struct qos_info *qos)
+{
+       __u32 line_capacity;
+
+       line_capacity = qos->window_size.value *
                (qos->data_size.value + 6 + qos->additional_bofs.value) +
-               irlap_min_turn_time_in_bytes(qos->baud_rate.value, 
+               irlap_min_turn_time_in_bytes(qos->baud_rate.value,
                                             qos->min_turn_time.value);
-       
+
        IRDA_DEBUG(2, "%s(), requested line capacity=%d\n",
                   __FUNCTION__, line_capacity);
-       
-       return line_capacity;                                     
+
+       return line_capacity;
 }
+#endif
 
 void irda_qos_bits_to_value(struct qos_info *qos)
 {