Merge tag 'v3.10.72' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / core / rtnetlink.c

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index a67310e00b3fffedd426a2ed1c1843b16caaa4c3..7e051eef26134b532cec6dbcbadc9de0fa1098d5 100644 (file)
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -54,6 +54,8 @@
 #include <net/rtnetlink.h>
 #include <net/net_namespace.h>
 
+#include <linux/xlog.h>
+
 struct rtnl_link {
        rtnl_doit_func          doit;
        rtnl_dumpit_func        dumpit;
@@ -64,13 +66,22 @@ static DEFINE_MUTEX(rtnl_mutex);
 
 void rtnl_lock(void)
 {
+       #ifdef CONFIG_MTK_NET_LOGGING  
+       printk(KERN_DEBUG "[mtk_net][rtnl_lock]rtnl_lock++\n");
+       #endif
        mutex_lock(&rtnl_mutex);
+       #ifdef CONFIG_MTK_NET_LOGGING  
+       printk(KERN_DEBUG "[mtk_net][rtnl_lock]rtnl_lock--\n");
+       #endif
 }
 EXPORT_SYMBOL(rtnl_lock);
 
 void __rtnl_unlock(void)
 {
        mutex_unlock(&rtnl_mutex);
+       #ifdef CONFIG_MTK_NET_LOGGING  
+       printk(KERN_DEBUG "[mtk_net][rtnl_lock]rtnl_unlock done\n");
+       #endif
 }
 
 void rtnl_unlock(void)
@@ -1981,7 +1992,10 @@ void rtmsg_ifinfo(int type, struct net_device *dev, unsigned int change)
        struct sk_buff *skb;
        int err = -ENOBUFS;
        size_t if_info_size;
-
+       #ifdef CONFIG_MTK_NET_LOGGING  
+    printk(KERN_INFO "[mtk_net][rtnetlink]rtmsg_ifinfo type:%d, dev:%s, change:%u, pid = %d", 
+               type, dev->name, change, current->pid);
+    #endif
        skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), GFP_KERNEL);
        if (skb == NULL)
                goto errout;