Made non static rx_dev_list namespace safe -> can_rx_dev_list.

git-svn-id: svn://svn.berlios.de//socketcan/trunk@553 030b6a49-0b11-0410-94ab-b0dab22257f2

diff --git a/kernel/2.6/net/can/af_can.c b/kernel/2.6/net/can/af_can.c
index ec441992525939400d9ed3242978852e947249ff..e166979f35fbaefb211c03e3feb98c8bf6345c20 100644 (file)
--- a/kernel/2.6/net/can/af_can.c
+++ b/kernel/2.6/net/can/af_can.c
@@ -87,7 +87,7 @@ static int stats_timer __read_mostly = 1;
 module_param(stats_timer, int, S_IRUGO);
 MODULE_PARM_DESC(stats_timer, "enable timer for statistics (default:on)");
 
-HLIST_HEAD(rx_dev_list);
+HLIST_HEAD(can_rx_dev_list);
 static struct dev_rcv_lists rx_alldev_list;
 static DEFINE_SPINLOCK(rcv_lists_lock);
 
@@ -380,7 +380,7 @@ static struct dev_rcv_lists *find_dev_rcv_lists(struct net_device *dev)
         * cursor variable n to decide if a match was found.
         */
 
-       hlist_for_each_entry_rcu(d, n, &rx_dev_list, list) {
+       hlist_for_each_entry_rcu(d, n, &can_rx_dev_list, list) {
                if (d->dev == dev)
                        break;
        }
@@ -836,7 +836,7 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg,
                d->dev = dev;
 
                spin_lock(&rcv_lists_lock);
-               hlist_add_head_rcu(&d->list, &rx_dev_list);
+               hlist_add_head_rcu(&d->list, &can_rx_dev_list);
                spin_unlock(&rcv_lists_lock);
 
                break;
@@ -908,7 +908,7 @@ static __init int can_init(void)
         */
 
        spin_lock(&rcv_lists_lock);
-       hlist_add_head_rcu(&rx_alldev_list.list, &rx_dev_list);
+       hlist_add_head_rcu(&rx_alldev_list.list, &can_rx_dev_list);
        spin_unlock(&rcv_lists_lock);
 
        if (stats_timer) {
@@ -947,10 +947,10 @@ static __exit void can_exit(void)
        unregister_netdevice_notifier(&can_netdev_notifier);
        sock_unregister(PF_CAN);
 
-       /* remove rx_dev_list */
+       /* remove can_rx_dev_list */
        spin_lock(&rcv_lists_lock);
        hlist_del(&rx_alldev_list.list);
-       hlist_for_each_entry_safe(d, n, next, &rx_dev_list, list) {
+       hlist_for_each_entry_safe(d, n, next, &can_rx_dev_list, list) {
                hlist_del(&d->list);
                kfree(d);
        }

diff --git a/kernel/2.6/net/can/af_can.h b/kernel/2.6/net/can/af_can.h
index f53339c8fc4888efa1250d903e7c6389d0d37c8d..4748e3f71ec27e1726b6f8b8055ae785ce45d569 100644 (file)
--- a/kernel/2.6/net/can/af_can.h
+++ b/kernel/2.6/net/can/af_can.h
@@ -117,6 +117,6 @@ extern void can_stat_update(unsigned long data);
 extern struct timer_list stattimer;    /* timer for statistics update */
 extern struct s_stats  stats;          /* packet statistics */
 extern struct s_pstats pstats;         /* receive list statistics */
-extern struct hlist_head rx_dev_list;  /* rx dispatcher structures */
+extern struct hlist_head can_rx_dev_list;      /* rx dispatcher structures */
 
 #endif /* AF_CAN_H */

diff --git a/kernel/2.6/net/can/proc.c b/kernel/2.6/net/can/proc.c
index c8f8f681ede9619daa66dcaccb2a122b8dd9fc01..25bff64876f05b28c6ef8cb2ac3e262772fa4dc4 100644 (file)
--- a/kernel/2.6/net/can/proc.c
+++ b/kernel/2.6/net/can/proc.c
@@ -375,7 +375,7 @@ static int can_proc_read_rcvlist(char *page, char **start, off_t off,
                        "\nreceive list '%s':\n", rx_list_name[idx]);
 
        rcu_read_lock();
-       hlist_for_each_entry_rcu(d, n, &rx_dev_list, list) {
+       hlist_for_each_entry_rcu(d, n, &can_rx_dev_list, list) {
 
                if (!hlist_empty(&d->rx[idx])) {
                        len = can_print_recv_banner(page, len);
@@ -408,7 +408,7 @@ static int can_proc_read_rcvlist_sff(char *page, char **start, off_t off,
                        "\nreceive list 'rx_sff':\n");
 
        rcu_read_lock();
-       hlist_for_each_entry_rcu(d, n, &rx_dev_list, list) {
+       hlist_for_each_entry_rcu(d, n, &can_rx_dev_list, list) {
                int i, all_empty = 1;
                /* check wether at least one list is non-empty */
                for (i = 0; i < 0x800; i++)