mtk: 3.10 updates

15 files changed, 95 insertions, 102 deletions

diff --git a/net/activity_stats.c b/net/activity_stats.c
index 4609ce204..3eab713bc 100644
--- a/net/activity_stats.c
+++ b/net/activity_stats.c
@@ -101,7 +101,7 @@ static const struct file_operations activity_stats_fops = {
 	.open		= activity_stats_open,
 	.read		= seq_read,
 	.llseek		= seq_lseek,
-	.release	= seq_release,
+	.release	= single_release,
 };
 
 static struct notifier_block activity_stats_notifier_block = {
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 981fed397..e062948e9 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -564,7 +564,8 @@ static ssize_t store_rps_map(struct netdev_rx_queue *queue,
 	}
 
 	i = 0;
-	for_each_cpu_and(cpu, mask, cpu_online_mask)
+	/*for_each_cpu_and(cpu, mask, cpu_online_mask)*/
+	for_each_cpu_and(cpu, mask, cpu_present_mask)
 		map->cpus[i++] = cpu;
 
 	if (i)
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 710859c53..5fe16a76d 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -157,7 +157,6 @@ static const struct neigh_ops arp_broken_ops = {
 	.connected_output =	neigh_compat_output,
 };
 
-/* MTK_NET_CHANGES */
 struct neigh_table arp_tbl = {
 	.family		= AF_INET,
 	.key_len	= 4,
@@ -705,7 +704,7 @@ void arp_send(int type, int ptype, __be32 dest_ip,
 	if (dev->flags&IFF_NOARP)
 		return;
 	#ifdef CONFIG_MTK_NET_LOGGING  	
-    printk(KERN_INFO "[mtk_net][arp]arp_send type = %d, dev = %s\n", type, dev->name);
+    pr_debug(KERN_INFO "[mtk_net][arp]arp_send type = %d, dev = %s\n", type, dev->name);
     #endif
 	skb = arp_create(type, ptype, dest_ip, dev, src_ip,
 			 dest_hw, src_hw, target_hw);
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index f31866e9a..5464901b8 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -623,15 +623,15 @@ static int inet_rtm_delroute(struct sk_buff *skb, struct nlmsghdr *nlh)
 	struct fib_config cfg;
 	struct fib_table *tb;
 	int err;
-    #ifdef CONFIG_MTK_NET_LOGGING 
-	printk(KERN_INFO "[mtk_net][RTlog delete] inet_rtm_delroute !\n");
-	#endif
+	//#ifdef CONFIG_MTK_NET_LOGGING
+	//printk(KERN_INFO "[mtk_net][RTlog delete] inet_rtm_delroute !\n");
+	//#endif
 	err = rtm_to_fib_config(net, skb, nlh, &cfg);
 	if (err < 0)
 		goto errout;
-	#ifdef CONFIG_MTK_NET_LOGGING 
-	printk(KERN_INFO "[mtk_net][RTlog info]  inet_rtm_delroute  cfg.fc_dst =%08x, cfg.fc_gw =%08x\n",cfg.fc_dst,cfg.fc_gw);
-    #endif
+	//#ifdef CONFIG_MTK_NET_LOGGING
+	//printk(KERN_INFO "[mtk_net][RTlog info]  inet_rtm_delroute  cfg.fc_dst =%08x, cfg.fc_gw =%08x\n",cfg.fc_dst,cfg.fc_gw);
+	//#endif
 	tb = fib_get_table(net, cfg.fc_table);
 	if (tb == NULL) {
 		err = -ESRCH;
@@ -649,16 +649,16 @@ static int inet_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh)
 	struct fib_config cfg;
 	struct fib_table *tb;
 	int err;
-	#ifdef CONFIG_MTK_NET_LOGGING 
-	printk(KERN_INFO "[mtk_net][RTlog insert] inet_rtm_newroute !\n");
-	#endif
+	//#ifdef CONFIG_MTK_NET_LOGGING 
+	//printk(KERN_INFO "[mtk_net][RTlog insert] inet_rtm_newroute !\n");
+	//#endif
 
 	err = rtm_to_fib_config(net, skb, nlh, &cfg);
 	if (err < 0)
 		goto errout;
-	#ifdef CONFIG_MTK_NET_LOGGING 
-	printk(KERN_INFO "[mtk_net][RTlog info]  inet_rtm_newroute  cfg.fc_dst =%08x,cfg.fc_gw =%08x \n",cfg.fc_dst,cfg.fc_gw);
-	#endif
+	//#ifdef CONFIG_MTK_NET_LOGGING 
+	//printk(KERN_INFO "[mtk_net][RTlog info]  inet_rtm_newroute  cfg.fc_dst =%08x,cfg.fc_gw =%08x \n",cfg.fc_dst,cfg.fc_gw);
+	//#endif
 
 	tb = fib_new_table(net, cfg.fc_table);
 	if (tb == NULL) {
@@ -784,9 +784,9 @@ void fib_add_ifaddr(struct in_ifaddr *ifa)
 	    (prefix != addr || ifa->ifa_prefixlen < 32)) {
 	    /* MTK_NET_CHANGES */
 	    if(0 == strncmp(dev->name, "ccmni", 2)){
-	    #ifdef CONFIG_MTK_NET_LOGGING 
-		printk(KERN_INFO "[mtk_net][RTlog] ignore ccmni subnet route\n");
-		#endif
+		//#ifdef CONFIG_MTK_NET_LOGGING 
+		//printk(KERN_INFO "[mtk_net][RTlog] ignore ccmni subnet route\n");
+		//#endif
 		} else {
 		fib_magic(RTM_NEWROUTE,
 			  dev->flags & IFF_LOOPBACK ? RTN_LOCAL : RTN_UNICAST,
@@ -1047,7 +1047,7 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
 	switch (event) {
 	case NETDEV_UP:
 		#ifdef CONFIG_MTK_NET_LOGGING 
-		printk(KERN_INFO "[mtk_net][RTlog insert]   fib_inetaddr_event()  %s NETDEV_UP!\n", ifa->ifa_dev->dev->name);
+		pr_debug(KERN_INFO "[mtk_net][RTlog insert]   fib_inetaddr_event()  %s NETDEV_UP!\n", ifa->ifa_dev->dev->name);
 		#endif
 		fib_add_ifaddr(ifa);
 #ifdef CONFIG_IP_ROUTE_MULTIPATH
@@ -1057,9 +1057,9 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
 		rt_cache_flush(dev_net(dev));
 		break;
 	case NETDEV_DOWN:
-		#ifdef CONFIG_MTK_NET_LOGGING 
-		printk(KERN_INFO "[mtk_net][RTlog delete]   fib_inetaddr_event()  %s NETDEV_DOWN!\n", ifa->ifa_dev->dev->name);
-		#endif
+		//#ifdef CONFIG_MTK_NET_LOGGING 
+		//printk(KERN_INFO "[mtk_net][RTlog delete]   fib_inetaddr_event()  %s NETDEV_DOWN!\n", ifa->ifa_dev->dev->name);
+		//#endif
 		fib_del_ifaddr(ifa, NULL);
 		atomic_inc(&net->ipv4.dev_addr_genid);
 		if (ifa->ifa_dev->ifa_list == NULL) {
@@ -1094,7 +1094,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
 	switch (event) {
 	case NETDEV_UP:
 		#ifdef CONFIG_MTK_NET_LOGGING 
-		printk(KERN_INFO "[mtk_net][RTlog insert]   fib_netdev_event()  %s NETDEV_UP!\n", dev->name);
+		pr_debug(KERN_INFO "[mtk_net][RTlog insert]   fib_netdev_event()  %s NETDEV_UP!\n", dev->name);
 		#endif
 		for_ifa(in_dev) {
 			fib_add_ifaddr(ifa);
@@ -1107,7 +1107,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
 		break;
 	case NETDEV_DOWN:
 		#ifdef CONFIG_MTK_NET_LOGGING 
-		printk(KERN_INFO "[mtk_net][RTlog delete]   fib_netdev_event()  %s NETDEV_DOWN!\n", dev->name);
+		pr_debug(KERN_INFO "[mtk_net][RTlog delete]   fib_netdev_event()  %s NETDEV_DOWN!\n", dev->name);
 		#endif
 		fib_disable_ip(dev, 0);
 		break;
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index acabb4d63..45f83c279 100644
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -781,7 +781,7 @@ int inet_csk_listen_start(struct sock *sk, const int nr_table_entries)
 	if (!sk->sk_prot->get_port(sk, inet->inet_num)) {
 		inet->inet_sport = htons(inet->inet_num);
 		#ifdef CONFIG_MTK_NET_LOGGING 
-        printk(KERN_WARNING "[mtk_net][socket] inet_csk_listen_start inet->inet_sport:%d,inet->inet_num:%d",inet->inet_sport,inet->inet_num);
+        pr_debug(KERN_WARNING "[mtk_net][socket] inet_csk_listen_start inet->inet_sport:%d,inet->inet_num:%d",inet->inet_sport,inet->inet_num);
         #endif
 		sk_dst_reset(sk);
 		sk->sk_prot->hash(sk);
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index e789e9217..c303d7e05 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -3559,9 +3559,7 @@ int tcp_nuke_addr(struct net *net, struct sockaddr *addr)
 	int family = addr->sa_family;
 	unsigned int bucket;
 	
-	/*mtk_net:debug log*/
-  int count = 0; 
-	struct in_addr *in;
+	struct in_addr *in = NULL;
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 	struct in6_addr *in6 = NULL ;
 #endif
@@ -3574,8 +3572,6 @@ int tcp_nuke_addr(struct net *net, struct sockaddr *addr)
 	} else {
 		return -EAFNOSUPPORT;
 	}
-		/*mtk_net:debug log*/
-  printk(KERN_INFO "[mtk_net][tcp]tcp_nuke_addr: tcp_hashinfo.ehash_mask = %d\n",tcp_hashinfo.ehash_mask);
 	for (bucket = 0; bucket <= tcp_hashinfo.ehash_mask; bucket++) {
 		struct hlist_nulls_node *node;
 		struct sock *sk;
@@ -3627,15 +3623,14 @@ restart:
 			// Check for SOCK_DEAD again, it could have changed.
 			// Add a write barrier, see tcp_reset().
 			local_bh_disable();
-			sk->sk_err = ETIMEDOUT;
-			sk->sk_error_report(sk);
-			count++;
-            /*mtk_net: skip closed sk*/
-			if(sk->sk_state != TCP_CLOSE && sk->sk_shutdown != SHUTDOWN_MASK)
-				{
-					printk(KERN_INFO "[mtk_net][tcp]skip ALPS01866438 Google Issue!\n");			 
-				}
-			tcp_done(sk);
+
+			if (!sock_flag(sk, SOCK_DEAD)) {
+				smp_wmb();  /* be consistent with tcp_reset */
+				sk->sk_err = ETIMEDOUT;
+				sk->sk_error_report(sk);
+				tcp_done(sk);
+			}
+
 			release_sock(sk);
 			local_bh_enable();
 			sock_put(sk);
@@ -3644,6 +3639,6 @@ restart:
 		}
 		spin_unlock_bh(lock);
 	}
-	printk(KERN_INFO "[mtk_net][tcp]tcp_nuke_addr : count = %d\n",count);
+
 	return 0;
 }
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 0d093aacc..8ebd25845 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -1887,7 +1887,7 @@ void tcp_enter_loss(struct sock *sk, int how)
 	if (icsk->icsk_MMSRB == 1)
 	{
 		#ifdef CONFIG_MTK_NET_LOGGING 
-	    printk("[mtk_net][mmspb] tcp_enter_loss snd_cwnd=%u, snd_cwnd_cnt=%u\n", tp->snd_cwnd, tp->snd_cwnd_cnt);
+	    pr_debug("[mtk_net][mmspb] tcp_enter_loss snd_cwnd=%u, snd_cwnd_cnt=%u\n", tp->snd_cwnd, tp->snd_cwnd_cnt);
         #endif
             if (tp->mss_cache != 0)
                 tp->snd_cwnd = (tp->rcv_wnd / tp->mss_cache);
@@ -1905,11 +1905,11 @@ void tcp_enter_loss(struct sock *sk, int how)
                 tp->snd_cwnd = tp->snd_ssthresh / 2 + 4;
             }
             #ifdef CONFIG_MTK_NET_LOGGING 
-            printk("[mtk_net][mmspb] tcp_enter_loss update snd_cwnd=%u\n", tp->snd_cwnd);
+            pr_debug("[mtk_net][mmspb] tcp_enter_loss update snd_cwnd=%u\n", tp->snd_cwnd);
             #endif
             icsk1->icsk_MMSRB = 0;
             #ifdef CONFIG_MTK_NET_LOGGING 
-            printk("[mtk_net][mmspb] tcp_enter_loss set icsk_MMSRB=0\n");
+            pr_debug("[mtk_net][mmspb] tcp_enter_loss set icsk_MMSRB=0\n");
             #endif
 	}
         else
@@ -5330,7 +5330,7 @@ slow_path:
 	if (len < (th->doff << 2) || tcp_checksum_complete_user(sk, skb))
 		goto csum_error;
 
-	if (!th->ack && !th->rst)
+	if (!th->ack && !th->rst && !th->syn)
 		goto discard;
 
 	/*
@@ -5747,7 +5747,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
 			goto discard;
 	}
 
-	if (!th->ack && !th->rst)
+	if (!th->ack && !th->rst && !th->syn)
 		goto discard;
 
 	if (!tcp_validate_incoming(sk, skb, th, 0))
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index 98cd820c1..626e1b04c 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -423,7 +423,7 @@ void tcp_retransmit_timer(struct sock *sk)
 	if (icsk->icsk_MMSRB == 1)
 	{
 	    	#ifdef CONFIG_MTK_NET_LOGGING  
-	        printk(KERN_DEBUG "[mtk_net][mmspb] tcp_retransmit_timer enter loss\n");
+	        pr_debug(KERN_DEBUG "[mtk_net][mmspb] tcp_retransmit_timer enter loss\n");
 	        #endif
 	}
 	tcp_enter_loss(sk, 0);
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 4e8c07b36..530f7c7d9 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -180,7 +180,7 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = {
 	.rtr_solicits		= MAX_RTR_SOLICITATIONS,
 	.rtr_solicit_interval	= RTR_SOLICITATION_INTERVAL,
 	.rtr_solicit_delay	= MAX_RTR_SOLICITATION_DELAY,
-	.use_tempaddr 		= 1,
+	.use_tempaddr 		= 0,
 	.temp_valid_lft		= TEMP_VALID_LIFETIME,
 	.temp_prefered_lft	= TEMP_PREFERRED_LIFETIME,
 	.regen_max_retry	= REGEN_MAX_RETRY,
@@ -215,7 +215,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {
 	.rtr_solicits		= MAX_RTR_SOLICITATIONS,
 	.rtr_solicit_interval	= RTR_SOLICITATION_INTERVAL,
 	.rtr_solicit_delay	= MAX_RTR_SOLICITATION_DELAY,
-	.use_tempaddr		= 1,
+	.use_tempaddr		= 0,
 	.temp_valid_lft		= TEMP_VALID_LIFETIME,
 	.temp_prefered_lft	= TEMP_PREFERRED_LIFETIME,
 	.regen_max_retry	= REGEN_MAX_RETRY,
@@ -3259,7 +3259,7 @@ static void addrconf_rs_timer(unsigned long data)
 		 * Note: we do not support deprecated "all on-link"
 		 * assumption any longer.
 		 */
-		printk("%s: no IPv6 routers present\n", idev->dev->name);
+		pr_debug("%s: no IPv6 routers present\n", idev->dev->name);
 	}
 
 out:
@@ -4764,8 +4764,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
 		addrconf_leave_solict(ifp->idev, &ifp->addr);
 		dst_hold(&ifp->rt->dst);
 
-		if (ip6_del_rt(ifp->rt))
-			dst_free(&ifp->rt->dst);
+		ip6_del_rt(ifp->rt);
 		break;
 	}
 	atomic_inc(&net->ipv6.dev_addr_genid);
@@ -4812,17 +4811,15 @@ errout:
 static int inet6_fill_nora(struct sk_buff *skb, struct inet6_dev *idev,
 			      u32 portid, u32 seq,int event, unsigned int flags)
 {
-    struct net_device *dev = idev->dev;
+struct net_device *dev = idev->dev;
 	struct nlmsghdr *nlh;
 	struct ifinfomsg *hdr;
-	void *protoinfo;
-	char *name;
-	
+
 	nlh = nlmsg_put(skb, portid, seq, event, sizeof(*hdr), flags);
 	if (nlh == NULL)
 		return -EMSGSIZE;
 
-    hdr = nlmsg_data(nlh);
+	hdr = nlmsg_data(nlh);
 	hdr->ifi_family = AF_INET6;
 	hdr->__ifi_pad = 0;
 	hdr->ifi_type = dev->type;
@@ -4832,10 +4829,6 @@ static int inet6_fill_nora(struct sk_buff *skb, struct inet6_dev *idev,
 
 	return nlmsg_end(skb, nlh);
 
-
-nla_put_failure:
-	nlmsg_cancel(skb, nlh);
-	return -EMSGSIZE;
 }
 #ifdef CONFIG_SYSCTL
 
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 46458ee31..c2adde668 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -837,6 +837,10 @@ int fib6_add(struct fib6_node *root, struct rt6_info *rt, struct nl_info *info)
 	int allow_create = 1;
 	int replace_required = 0;
 
+	if (WARN_ON_ONCE((rt->dst.flags & DST_NOCACHE) &&
+			 !atomic_read(&rt->dst.__refcnt)))
+  	  return -EINVAL;
+
 	if (info->nlh) {
 		if (!(info->nlh->nlmsg_flags & NLM_F_CREATE))
 			allow_create = 0;
@@ -929,6 +933,7 @@ int fib6_add(struct fib6_node *root, struct rt6_info *rt, struct nl_info *info)
 		fib6_start_gc(info->nl_net, rt);
 		if (!(rt->rt6i_flags & RTF_CACHE))
 			fib6_prune_clones(info->nl_net, pn, rt);
+		rt->dst.flags &= ~DST_NOCACHE;
 	}
 
 out:
@@ -953,6 +958,7 @@ out:
 			atomic_inc(&pn->leaf->rt6i_ref);
 		}
 #endif
+		if (!(rt->dst.flags & DST_NOCACHE))
 		dst_free(&rt->dst);
 	}
 	return err;
@@ -964,6 +970,7 @@ out:
 st_failure:
 	if (fn && !(fn->fn_flags & (RTN_RTINFO|RTN_ROOT)))
 		fib6_repair_tree(info->nl_net, fn);
+if (!(rt->dst.flags & DST_NOCACHE))
 	dst_free(&rt->dst);
 	return err;
 #endif
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 5c5ca508f..6e7caf47d 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1119,8 +1119,7 @@ static void ip6_link_failure(struct sk_buff *skb)
 	if (rt) {
 		if (rt->rt6i_flags & RTF_CACHE) {
 			dst_hold(&rt->dst);
-			if (ip6_del_rt(rt))
-				dst_free(&rt->dst);
+			ip6_del_rt(rt);
 		} else if (rt->rt6i_node && (rt->rt6i_flags & RTF_DEFAULT)) {
 			rt->rt6i_node->fn_sernum = -1;
 		}
@@ -1622,7 +1621,8 @@ static int __ip6_del_rt(struct rt6_info *rt, struct nl_info *info)
 	struct fib6_table *table;
 	struct net *net = dev_net(rt->dst.dev);
 
-	if (rt == net->ipv6.ip6_null_entry) {
+	if (rt == net->ipv6.ip6_null_entry ||
+	    rt->dst.flags & DST_NOCACHE) {
 		err = -ENOENT;
 		goto out;
 	}
@@ -2102,6 +2102,7 @@ struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,
 	rt->rt6i_dst.addr = *addr;
 	rt->rt6i_dst.plen = 128;
 	rt->rt6i_table = fib6_get_table(net, RT6_TABLE_LOCAL);
+	rt->dst.flags |= DST_NOCACHE;
 
 	atomic_set(&rt->dst.__refcnt, 1);
 
diff --git a/net/netfilter/xt_qtaguid.c b/net/netfilter/xt_qtaguid.c
index e93a416b3..ff929422b 100644
--- a/net/netfilter/xt_qtaguid.c
+++ b/net/netfilter/xt_qtaguid.c
@@ -1749,8 +1749,6 @@ static bool qtaguid_mt(const struct sk_buff *skb, struct xt_action_param *par)
 			account_for_uid(skb, sk, 0, par);
 		res = ((info->match ^ info->invert) &
 			(XT_QTAGUID_UID | XT_QTAGUID_GID)) == 0;
-		/*mtk_net: patch for duplicated account for uid 0*/
-		res = true;
 		atomic64_inc(&qtu_events.match_no_sk_file);
 		goto put_sock_ret_res;
 	}
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 60676080c..9e07292ad 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -131,11 +131,11 @@ int sch_direct_xmit(struct sk_buff *skb, struct Qdisc *q,
     if(ret != NETDEV_TX_OK ){
     	if(qdisc_qlen(q) < 16){
     		if(4 == (qdisc_qlen(q)) % 16)
-    			printk(KERN_INFO "[mtk_net][sched]dev_hard_start_xmit ret = %d(%s), txq state = %lu\n", 
+    			pr_debug("[mtk_net][sched]dev_hard_start_xmit ret = %d(%s), txq state = %lu\n", 
     				ret, dev->name, txq->state);
     	} else {
     		if(64 == (qdisc_qlen(q)) % 128)
-    			printk(KERN_INFO "[mtk_net][sched]warning: dev_hard_start_xmit ret = %d(%s), txq state = %lu\n", 
+    			pr_debug("[mtk_net][sched]warning: dev_hard_start_xmit ret = %d(%s), txq state = %lu\n", 
     				ret, dev->name, txq->state);    		
     	}
     }
@@ -780,7 +780,7 @@ void dev_activate(struct net_device *dev)
 	   virtual interfaces
 	 */
 	 
-	printk(KERN_INFO "[mtk_net][sched]dev_activate dev = %s \n", dev->name);
+	pr_debug("[mtk_net][sched]dev_activate dev = %s \n", dev->name);
 
 	if (dev->qdisc == &noop_qdisc)
 		attach_default_qdiscs(dev);
@@ -836,7 +836,7 @@ static bool some_qdisc_is_busy(struct net_device *dev)
 		q = dev_queue->qdisc_sleeping;
 		/*MTK_NET_CHANGES*/
 		if(q == NULL){
-			printk(KERN_WARNING "some_qdisc_is_busy dev=%p, i=%d, dev_q=%p",
+			pr_debug("some_qdisc_is_busy dev=%p, i=%d, dev_q=%p",
 			       dev, i, dev_queue);
 			BUG_ON(q == NULL);
 		}
@@ -896,7 +896,7 @@ void dev_deactivate(struct net_device *dev)
 	LIST_HEAD(single);
 
 	list_add(&dev->unreg_list, &single);
-	printk(KERN_INFO "[mtk_net][sched]dev_deactivate dev = %s \n", dev->name);
+	pr_debug("[mtk_net][sched]dev_deactivate dev = %s \n", dev->name);
 	dev_deactivate_many(&single);
 	list_del(&single);
 }
diff --git a/net/socket.c b/net/socket.c
index 0644eaef1..19904e332 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -588,7 +588,7 @@ void sock_release(struct socket *sock)
 	}
 
 	if (rcu_dereference_protected(sock->wq, 1)->fasync_list)
-		printk(KERN_ERR "[mtk_net][socket]sock_release: fasync list not empty!\n");
+		pr_debug(KERN_ERR "[mtk_net][socket]sock_release: fasync list not empty!\n");
 
 	if (test_bit(SOCK_EXTERNALLY_ALLOCATED, &sock->flags))
 		return;
@@ -1169,7 +1169,7 @@ static int sock_close(struct inode *inode, struct file *filp)
 
 	if (!inode) {
 		#ifdef CONFIG_MTK_NET_LOGGING 
-		printk(KERN_DEBUG "[mtk_net][socket]sock_close: NULL inode\n");
+		pr_debug(KERN_DEBUG "[mtk_net][socket]sock_close: NULL inode\n");
 		#endif
 		return 0;
 	}
@@ -1177,11 +1177,11 @@ static int sock_close(struct inode *inode, struct file *filp)
         struct socket *sock = SOCKET_I(inode);
 	if((sock != NULL) && (sock->sk != NULL))
 		{
-	       printk(KERN_INFO "[mtk_net][socekt]socket_close[%lu] refcnt: %d\n",inode->i_ino,atomic_read(&sock->sk->sk_refcnt)); 
+	       pr_debug(KERN_INFO "[mtk_net][socekt]socket_close[%lu] refcnt: %d\n",inode->i_ino,atomic_read(&sock->sk->sk_refcnt)); 
 		}
 	else
 		{
-		   printk(KERN_INFO "[mtk_net][socekt]socket_close[%lu] \n",inode->i_ino); 
+		   pr_debug(KERN_INFO "[mtk_net][socekt]socket_close[%lu] \n",inode->i_ino); 
 		}
 	#endif
 	sock_release(SOCKET_I(inode));
@@ -1282,7 +1282,7 @@ int __sock_create(struct net *net, int family, int type, int protocol,
 		if (!warned) {
 			warned = 1;
 			#ifdef CONFIG_MTK_NET_LOGGING 
-			printk(KERN_INFO "[mtk_net][socket]%s uses obsolete (PF_INET,SOCK_PACKET)\n",
+			pr_debug(KERN_INFO "[mtk_net][socket]%s uses obsolete (PF_INET,SOCK_PACKET)\n",
 			       current->comm);
 			#endif
 		}
@@ -1418,13 +1418,13 @@ out:
 	if((retval >= 0)&& sock && SOCK_INODE(sock) )
 	{
 	   #ifdef CONFIG_MTK_NET_LOGGING 
-	   printk(KERN_INFO "[mtk_net][socket]socket_create[%lu]:fd=%d \n",SOCK_INODE(sock)->i_ino,retval);
+	   pr_debug(KERN_INFO "[mtk_net][socket]socket_create[%lu]:fd=%d \n",SOCK_INODE(sock)->i_ino,retval);
 	   #endif               
 	}
 	 else
 	 {
 	 	#ifdef CONFIG_MTK_NET_LOGGING 	
-	   printk(KERN_INFO "[mtk_net][socket]socket_create:fd=%d \n",retval); 
+	   pr_debug(KERN_INFO "[mtk_net][socket]socket_create:fd=%d \n",retval); 
 	   #endif
 	 }
 	return retval;
@@ -1515,7 +1515,7 @@ SYSCALL_DEFINE4(socketpair, int, family, int, type, int, protocol,
             if(sock1 && SOCK_INODE(sock1) && sock2&& SOCK_INODE(sock2) )
             {
        	        #ifdef CONFIG_MTK_NET_LOGGING 
-	            printk(KERN_INFO "[mtk_net][socket]socketpair:fd1[%lu]=%d, fd2[%lu]=%d \n", SOCK_INODE(sock1)->i_ino,fd1,SOCK_INODE(sock2)->i_ino,fd2);
+	            pr_debug(KERN_INFO "[mtk_net][socket]socketpair:fd1[%lu]=%d, fd2[%lu]=%d \n", SOCK_INODE(sock1)->i_ino,fd1,SOCK_INODE(sock2)->i_ino,fd2);
 	            #endif             
 	     }
 	  
@@ -1525,7 +1525,7 @@ SYSCALL_DEFINE4(socketpair, int, family, int, type, int, protocol,
 	sys_close(fd2);
 	sys_close(fd1);
 	#ifdef CONFIG_MTK_NET_LOGGING 
-	printk(KERN_INFO "[mtk_net][socket]socketpair fail1: %d \n", err);
+	pr_debug(KERN_INFO "[mtk_net][socket]socketpair fail1: %d \n", err);
 	#endif
 	return err;
 
@@ -1535,8 +1535,8 @@ out_release_1:
 	sock_release(sock1);
 out:
 	#ifdef CONFIG_MTK_NET_LOGGING 
-    printk(KERN_INFO "[mtk_net][socket]socketpair fail2: %d \n", err);
-    #endif
+	pr_debug(KERN_INFO "[mtk_net][socket]socketpair fail2: %d \n", err);
+	#endif
 	return err;
 }
 
@@ -1570,7 +1570,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
       #ifdef CONFIG_MTK_NET_LOGGING 
 		    if((((struct sockaddr_in *)&address)->sin_family) != AF_UNIX)
 		    	{
-		    		 printk(KERN_WARNING "[mtk_net][socket] bind addr->sin_port:%d,err:%d \n",htons(((struct sockaddr_in *)&address)->sin_port),err);
+		    		 pr_debug(KERN_WARNING "[mtk_net][socket] bind addr->sin_port:%d,err:%d \n",htons(((struct sockaddr_in *)&address)->sin_port),err);
           }
         #endif		      
 		}
@@ -1695,7 +1695,7 @@ out:
         if( (err>=0)&& newsock && SOCK_INODE(newsock) )
       {
 	    	#ifdef CONFIG_MTK_NET_LOGGING 
-	        printk(KERN_INFO "[mtk_net][socket]socket_accept:fd=%d,server_sock[%lu], newsock[%lu] \n",err,SOCK_INODE(sock)->i_ino,SOCK_INODE(newsock)->i_ino);
+	        pr_debug(KERN_INFO "[mtk_net][socket]socket_accept:fd=%d,server_sock[%lu], newsock[%lu] \n",err,SOCK_INODE(sock)->i_ino,SOCK_INODE(newsock)->i_ino);
 	        #endif
 	    }  
 	    
@@ -2646,7 +2646,7 @@ int sock_register(const struct net_proto_family *ops)
 	int err;
 
 	if (ops->family >= NPROTO) {
-		printk(KERN_CRIT "[mtk_net][sock]protocol %d >= NPROTO(%d)\n", ops->family,
+		pr_debug(KERN_CRIT "[mtk_net][sock]protocol %d >= NPROTO(%d)\n", ops->family,
 		       NPROTO);
 		return -ENOBUFS;
 	}
@@ -2661,7 +2661,7 @@ int sock_register(const struct net_proto_family *ops)
 	}
 	spin_unlock(&net_family_lock);
     #ifdef CONFIG_MTK_NET_LOGGING 
-	printk(KERN_INFO "[mtk_net][socekt]NET: Registered protocol family %d\n", ops->family);
+	pr_debug(KERN_INFO "[mtk_net][socekt]NET: Registered protocol family %d\n", ops->family);
 	#endif
 	return err;
 }
@@ -2690,7 +2690,7 @@ void sock_unregister(int family)
 
 	synchronize_rcu();
     #ifdef CONFIG_MTK_NET_LOGGING 
-	printk(KERN_INFO "[mtk_net][socket]NET: Unregistered protocol family %d\n", family);
+	pr_debug(KERN_INFO "[mtk_net][socket]NET: Unregistered protocol family %d\n", family);
 	#endif
 }
 EXPORT_SYMBOL(sock_unregister);
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 0a4beba3e..99e986851 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -147,7 +147,6 @@ static struct hlist_head *unix_sockets_unbound(void *addr)
 
 //for aee interface start
 #define __UNIX_SOCKET_OUTPUT_BUF_SIZE__   3500
-static struct proc_dir_entry *gunix_socket_track_aee_entry = NULL;
 #define UNIX_SOCK_TRACK_AEE_PROCNAME "driver/usktrk_aee"
 #define UNIX_SOCK_TRACK_PROC_AEE_SIZE 3072
 
@@ -498,7 +497,7 @@ static void unix_sock_destructor(struct sock *sk)
 	WARN_ON(sk->sk_socket);
 	if (!sock_flag(sk, SOCK_DEAD)) {
 		#ifdef CONFIG_MTK_NET_LOGGING 
-		printk(KERN_INFO "[mtk_net][unix]Attempt to release alive unix socket: %p\n", sk);
+		pr_debug(KERN_INFO "[mtk_net][unix]Attempt to release alive unix socket: %p\n", sk);
 		#endif
 		return;
 	}
@@ -511,7 +510,7 @@ static void unix_sock_destructor(struct sock *sk)
 	sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1);
 	local_bh_enable();
     #ifdef UNIX_REFCNT_DEBUG
-	printk(KERN_DEBUG "[mtk_net][unix]UNIX %p is destroyed, %ld are still alive.\n", sk,
+	pr_debug(KERN_DEBUG "[mtk_net][unix]UNIX %p is destroyed, %ld are still alive.\n", sk,
 		atomic_long_read(&unix_nr_socks));
     #endif
 }
@@ -1172,7 +1171,7 @@ restart:
 #ifdef CONFIG_MTK_NET_LOGGING 
     if((SOCK_INODE(sock)!= NULL) && (sunaddr != NULL) && (other->sk_socket != NULL) && (SOCK_INODE(other->sk_socket) != NULL))
     {
-	       printk(KERN_INFO "[mtk_net][socket]unix_dgram_connect[%lu]:connect [%s] other[%lu]\n",SOCK_INODE(sock)->i_ino,sunaddr->sun_path,SOCK_INODE(other->sk_socket)->i_ino);
+	       pr_debug(KERN_INFO "[mtk_net][socket]unix_dgram_connect[%lu]:connect [%s] other[%lu]\n",SOCK_INODE(sock)->i_ino,sunaddr->sun_path,SOCK_INODE(other->sk_socket)->i_ino);
 	  }
 #endif 
             
@@ -1368,7 +1367,7 @@ restart:
 	#ifdef CONFIG_MTK_NET_LOGGING 
 	if((SOCK_INODE(sock)!= NULL) && (sunaddr != NULL) && (other->sk_socket != NULL) && (SOCK_INODE(other->sk_socket) != NULL))
   {
-	  printk(KERN_INFO "[mtk_net][socket]unix_stream_connect[%lu ]: connect [%s] other[%lu] \n",SOCK_INODE(sock)->i_ino,sunaddr->sun_path,SOCK_INODE(other->sk_socket)->i_ino);
+	  pr_debug(KERN_INFO "[mtk_net][socket]unix_stream_connect[%lu ]: connect [%s] other[%lu] \n",SOCK_INODE(sock)->i_ino,sunaddr->sun_path,SOCK_INODE(other->sk_socket)->i_ino);
 	}
   #endif 
 
@@ -1905,12 +1904,12 @@ static int unix_stream_sendmsg(struct kiocb *kiocb, struct socket *sock,
                         {
                 
                          #ifdef CONFIG_MTK_NET_LOGGING 
-                         printk(KERN_INFO " [mtk_net][unix]: sendmsg[%lu:%lu]:peer close\n" ,SOCK_INODE(sk->sk_socket)->i_ino,SOCK_INODE(other->sk_socket)->i_ino);
+                         pr_debug(KERN_INFO " [mtk_net][unix]: sendmsg[%lu:%lu]:peer close\n" ,SOCK_INODE(sk->sk_socket)->i_ino,SOCK_INODE(other->sk_socket)->i_ino);
 				         #endif
 		         }
 		         else{
 				   	    #ifdef CONFIG_MTK_NET_LOGGING 
-				        printk(KERN_INFO " [mtk_net][unix]: sendmsg[null:%lu]:peer close\n" ,SOCK_INODE(other->sk_socket)->i_ino);
+				        pr_debug(KERN_INFO " [mtk_net][unix]: sendmsg[null:%lu]:peer close\n" ,SOCK_INODE(other->sk_socket)->i_ino);
 				        #endif
 		         }        
 
@@ -1918,7 +1917,7 @@ static int unix_stream_sendmsg(struct kiocb *kiocb, struct socket *sock,
 		    else	
 					{
 						#ifdef CONFIG_MTK_NET_LOGGING 	
-				        printk(KERN_INFO " [mtk_net][unix]: sendmsg:peer close \n" );
+				        pr_debug(KERN_INFO " [mtk_net][unix]: sendmsg:peer close \n" );
 				        #endif
 				}
 		   		
@@ -2204,17 +2203,17 @@ again:
 				   if(other && other->sk_socket ){
 				   	#ifdef CONFIG_MTK_NET_LOGGING 
 				   	
-                     printk(KERN_INFO " [mtk_net][unix]: recvmsg[%lu:%lu]:exit read due to peer shutdown  \n" ,SOCK_INODE(sk->sk_socket)->i_ino,SOCK_INODE(other->sk_socket)->i_ino);
+                     pr_debug(KERN_INFO " [mtk_net][unix]: recvmsg[%lu:%lu]:exit read due to peer shutdown  \n" ,SOCK_INODE(sk->sk_socket)->i_ino,SOCK_INODE(other->sk_socket)->i_ino);
 				   #endif
 				   }else{				   
 				   	#ifdef CONFIG_MTK_NET_LOGGING 				   
-                     printk(KERN_INFO "[mtk_net][unix]: recvmsg[%lu:null]:exit read due to peer shutdown  \n" ,SOCK_INODE(sk->sk_socket)->i_ino);
+                     pr_debug(KERN_INFO "[mtk_net][unix]: recvmsg[%lu:null]:exit read due to peer shutdown  \n" ,SOCK_INODE(sk->sk_socket)->i_ino);
                      #endif
 				   }
 				 }
 			    else{	
 					#ifdef CONFIG_MTK_NET_LOGGING 
-				   printk(KERN_INFO " [mtk_net][unix]: recvmsg: exit read due to peer shutdown \n" );
+				   pr_debug(KERN_INFO " [mtk_net][unix]: recvmsg: exit read due to peer shutdown \n" );
 				   #endif
 			    }
 				goto unlock;
@@ -2232,18 +2231,18 @@ again:
                             {
                                 if(other && other->sk_socket ){
 				   	#ifdef CONFIG_MTK_NET_LOGGING 
-                     printk(KERN_INFO " [mtk_net][unix]: recvmsg[%lu:%lu]:exit read due to timeout  \n" ,SOCK_INODE(sk->sk_socket)->i_ino,SOCK_INODE(other->sk_socket)->i_ino);
+                     pr_debug(KERN_INFO " [mtk_net][unix]: recvmsg[%lu:%lu]:exit read due to timeout  \n" ,SOCK_INODE(sk->sk_socket)->i_ino,SOCK_INODE(other->sk_socket)->i_ino);
 				   #endif
 				   }else{				   
 				   	#ifdef CONFIG_MTK_NET_LOGGING 				   
-                     printk(KERN_INFO " [mtk_net][unix]: recvmsg[%lu:null]:exit read due to timeout  \n" ,SOCK_INODE(sk->sk_socket)->i_ino);
+                     pr_debug(KERN_INFO " [mtk_net][unix]: recvmsg[%lu:null]:exit read due to timeout  \n" ,SOCK_INODE(sk->sk_socket)->i_ino);
                      #endif
 				    }			  
 		           }
 			   else	
 					{
 						#ifdef CONFIG_MTK_NET_LOGGING 	
-				  printk(KERN_INFO " [mtk_net][unix]: recvmsg:exit read due to timeout \n" );
+				  pr_debug(KERN_INFO " [mtk_net][unix]: recvmsg:exit read due to timeout \n" );
 				  #endif
 				}
 		   		  
@@ -2735,7 +2734,7 @@ static int __init af_unix_init(void)
 
 	rc = proto_register(&unix_proto, 1);
 	if (rc != 0) {
-		printk(KERN_CRIT "%s: Cannot create unix_sock SLAB cache!\n",
+		pr_debug(KERN_CRIT "%s: Cannot create unix_sock SLAB cache!\n",
 		       __func__);
 		goto out;
 	}