1 files changed, 3 insertions, 5 deletions

diff --git a/net/can/af_can.c b/net/can/af_can.c
index 8ce926d3b2cb..0ce2ad0696da 100644
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -38,8 +38,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
- *
  */
 
 #include <linux/module.h>
@@ -719,7 +717,7 @@ int can_proto_register(const struct can_proto *cp)
                        proto);
                 err = -EBUSY;
         } else
-                rcu_assign_pointer(proto_tab[proto], cp);
+                RCU_INIT_POINTER(proto_tab[proto], cp);
 
         mutex_unlock(&proto_tab_lock);
 
@@ -740,7 +738,7 @@ void can_proto_unregister(const struct can_proto *cp)
 
         mutex_lock(&proto_tab_lock);
         BUG_ON(proto_tab[proto] != cp);
-        rcu_assign_pointer(proto_tab[proto], NULL);
+        RCU_INIT_POINTER(proto_tab[proto], NULL);
         mutex_unlock(&proto_tab_lock);
 
         synchronize_rcu();
@@ -857,7 +855,7 @@ static __exit void can_exit(void)
         struct net_device *dev;
 
         if (stats_timer)
-                del_timer(&can_stattimer);
+                del_timer_sync(&can_stattimer);
 
         can_remove_proc();