[PATCH] namespace pollution in irda qos

From:  Arnd Bergmann <arnd@bergmann-dalldorf.de>

  net/irda/qos.c exports some variables that are not used
  in any other file. This makes them static to avoid
  namespace conflicts

diff --git a/include/net/irda/qos.h b/include/net/irda/qos.h
index fd6e2de02a7ad879bfa92f1a76ce5675c0ed9db2..41ee53f94c527fccef9616c93d5e5be0078e67e2 100644 (file)
--- a/include/net/irda/qos.h
+++ b/include/net/irda/qos.h
@@ -83,19 +83,12 @@ struct qos_info {
 extern int sysctl_max_baud_rate;
 extern int sysctl_max_inactive_time;
 
-extern __u32 baud_rates[];
-extern __u32 data_sizes[];
-extern __u32 min_turn_times[];
-extern __u32 add_bofs[];
-extern __u32 compressions[];
-
 void irda_init_max_qos_capabilies(struct qos_info *qos);
 void irda_qos_compute_intersection(struct qos_info *, struct qos_info *);
 
 __u32 irlap_max_line_capacity(__u32 speed, __u32 max_turn_time);
 __u32 irlap_requested_line_capacity(struct qos_info *qos);
 
-int msb_index(__u16 byte);
 void irda_qos_bits_to_value(struct qos_info *qos);
 
 /* So simple, how could we not inline those two ?

diff --git a/net/irda/qos.c b/net/irda/qos.c
index cf7da45b97a1971077ce94d8ea57c001d019b4f9..c7dc0bf1c040aa32ed0d6dd3b239f9fe80b40ce8 100644 (file)
--- a/net/irda/qos.c
+++ b/net/irda/qos.c
@@ -96,15 +96,15 @@ 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);
 
-__u32 min_turn_times[]  = { 10000, 5000, 1000, 500, 100, 50, 10, 0 }; /* us */
-__u32 baud_rates[]      = { 2400, 9600, 19200, 38400, 57600, 115200, 576000, 
-                           1152000, 4000000, 16000000 };           /* bps */
-__u32 data_sizes[]      = { 64, 128, 256, 512, 1024, 2048 };        /* bytes */
-__u32 add_bofs[]        = { 48, 24, 12, 5, 3, 2, 1, 0 };            /* bytes */
-__u32 max_turn_times[]  = { 500, 250, 100, 50 };                    /* ms */
-__u32 link_disc_times[] = { 3, 8, 12, 16, 20, 25, 30, 40 };         /* secs */
-
-__u32 max_line_capacities[10][4] = {
+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 */
+static __u32 data_sizes[]      = { 64, 128, 256, 512, 1024, 2048 };        /* bytes */
+static __u32 add_bofs[]        = { 48, 24, 12, 5, 3, 2, 1, 0 };            /* bytes */
+static __u32 max_turn_times[]  = { 500, 250, 100, 50 };                    /* ms */
+static __u32 link_disc_times[] = { 3, 8, 12, 16, 20, 25, 30, 40 };         /* secs */
+
+static __u32 max_line_capacities[10][4] = {
        /* 500 ms     250 ms  100 ms  50 ms (max turn time) */
        {    100,      0,      0,     0 }, /*     2400 bps */
        {    400,      0,      0,     0 }, /*     9600 bps */
@@ -185,7 +185,7 @@ static inline __u32 index_value(int index, __u32 *array)
  *    Returns index to most significant bit (MSB) in word
  *
  */
-int msb_index (__u16 word) 
+static int msb_index (__u16 word) 
 {
        __u16 msb = 0x8000;
        int index = 15;   /* Current MSB */