Move to rsdk 3.2.4. Compiles cleanly.

Signed-off-by: Roman Yeryomin <roman@advem.lv>

1 files changed, 756 insertions, 251 deletions

diff --git a/target/linux/realtek/files/net/rtl/features/rtl_features.c b/target/linux/realtek/files/net/rtl/features/rtl_features.c
index a07cecac4..e46c3f430 100644
--- a/target/linux/realtek/files/net/rtl/features/rtl_features.c
+++ b/target/linux/realtek/files/net/rtl/features/rtl_features.c
@@ -10,7 +10,7 @@
 #include <linux/ip.h>
 #include <linux/tcp.h>
 
-#if defined(CONFIG_PROC_FS) 
+#if defined(CONFIG_PROC_FS)
 #include <linux/proc_fs.h>
 #endif
 
@@ -65,11 +65,15 @@ extern int rtl865x_curOpMode;
 #include <net/rtl/fastpath/fast_br.h>
 #endif
 
+#if defined(CONFIG_BRIDGE)&&defined(CONFIG_RTL_AVOID_ADDING_WLAN_PKT_TO_HW_NAT)
+#include <bridge/br_private.h>
+#endif
+
 #if defined(CONFIG_NET_SCHED)
 __DRAM_GEN int gQosEnabled;
 #endif
 
-#ifdef CONFIG_RTL_HARDWARE_NAT 
+#ifdef CONFIG_RTL_HARDWARE_NAT
 /*2007-12-19*/
 #ifdef CONFIG_RTL_LAYERED_DRIVER_L3
 #include <net/rtl/rtl865x_ip_api.h>
@@ -84,8 +88,8 @@ __DRAM_GEN int gQosEnabled;
 enum LR_RESULT (*FastPath_hook4)( rtl_fp_napt_entry *fpNaptEntry)=NULL;
 enum LR_RESULT (*FastPath_hook6)( rtl_fp_napt_entry *fpNaptEntry,
 #if defined(IMPROVE_QOS)
-									struct sk_buff *pskb, struct nf_conn *ct, 
-#endif								
+									struct sk_buff *pskb, struct nf_conn *ct,
+#endif
                                                                enum NP_FLAGS flags)=NULL;
 enum LR_RESULT (*FastPath_hook11)(rtl_fp_napt_entry *fpNaptEntry, uint32 interval)=NULL;
 int (*fast_path_hook)(struct sk_buff **pskb) = NULL;
@@ -96,16 +100,18 @@ EXPORT_SYMBOL(fast_path_hook);
 #endif
 
 #ifdef FAST_PPTP
-	void (*sync_tx_pptp_gre_seqno_hook)(struct sk_buff *skb) = NULL;	
+	void (*sync_tx_pptp_gre_seqno_hook)(struct sk_buff *skb) = NULL;
 #ifdef CONFIG_FAST_PATH_MODULE
 EXPORT_SYMBOL(sync_tx_pptp_gre_seqno_hook);
 #endif
 #endif
 
+int routerTypeFlag = 0;
+
 #if	defined(CONFIG_RTL_HARDWARE_NAT)
 __DRAM_GEN int gHwNatEnabled;
 
-int rtl865x_handle_nat(struct nf_conn *ct, int act, struct sk_buff *skb)
+int32 rtl865x_handle_nat(struct nf_conn *ct, int act, struct sk_buff *skb)
 {
 	struct nf_conn_nat *nat;
 	u_int32_t sip, dip, gip;
@@ -121,13 +127,15 @@ int rtl865x_handle_nat(struct nf_conn *ct, int act, struct sk_buff *skb)
 #if defined(CONFIG_RTL_LAYERED_DRIVER_L4)
 	rtl865x_napt_entry rtl865xNaptEntry;
 	rtl865x_priority rtl865xPrio;
+	#if defined(CONFIG_RTL_HW_QOS_SUPPORT)
 	rtl865x_qos_mark rtl865xQosMark;
+	#endif
 #endif
 
 	if (gHwNatEnabled!=1)
 		return -1;
 
-	proto = (ct->tuplehash[0].tuple.dst.protonum==IPPROTO_TCP)? 1: 0;
+	proto = (ct->tuplehash[0].tuple.dst.protonum==IPPROTO_TCP)?RTL865X_PROTOCOL_TCP:RTL865X_PROTOCOL_UDP;
 
 	if (ct->status & IPS_SRC_NAT)
 	{ /* outbound flow */
@@ -137,7 +145,7 @@ int rtl865x_handle_nat(struct nf_conn *ct, int act, struct sk_buff *skb)
 		sp  	= (proto)? ct->tuplehash[0].tuple.src.u.tcp.port: ct->tuplehash[0].tuple.src.u.udp.port;
 		dp  	= (proto)? ct->tuplehash[0].tuple.dst.u.tcp.port: ct->tuplehash[0].tuple.dst.u.udp.port;
 		gp  	= (proto)? ct->tuplehash[1].tuple.dst.u.tcp.port: ct->tuplehash[1].tuple.dst.u.udp.port;
-	} 
+	}
 	else if (ct->status & IPS_DST_NAT)
 	{ /* inbound flow */
 		sip	= ct->tuplehash[1].tuple.src.u3.ip;
@@ -147,7 +155,7 @@ int rtl865x_handle_nat(struct nf_conn *ct, int act, struct sk_buff *skb)
 		dp  	= (proto)? ct->tuplehash[1].tuple.dst.u.tcp.port: ct->tuplehash[1].tuple.dst.u.udp.port;
 		gp  	= (proto)? ct->tuplehash[0].tuple.dst.u.tcp.port: ct->tuplehash[0].tuple.dst.u.udp.port;
 	}
-	else 
+	else
 		return -1;
 
 	/* do not add hardware NAPT table if protocol is UDP and source IP address is equal to gateway IP address */
@@ -170,13 +178,10 @@ int rtl865x_handle_nat(struct nf_conn *ct, int act, struct sk_buff *skb)
 		rtl865xNaptEntry.extPort=gp;
 		rtl865xNaptEntry.remIp=dip;
 		rtl865xNaptEntry.remPort=dp;
-		
+
 		timeval = rtl865x_naptSync(&rtl865xNaptEntry, 0);
 #endif
-		if (timeval > 0)
-			return 0;
-		else
-			return -1;
+		return timeval;
 	}
 	else if (act == 0) {
 		/* delete */
@@ -189,7 +194,7 @@ int rtl865x_handle_nat(struct nf_conn *ct, int act, struct sk_buff *skb)
 		rtl865xNaptEntry.extPort=gp;
 		rtl865xNaptEntry.remIp=dip;
 		rtl865xNaptEntry.remPort=dp;
-		
+
 		rc = rtl865x_delNaptConnection(&rtl865xNaptEntry);
 #endif
 	}
@@ -265,11 +270,11 @@ int rtl865x_handle_nat(struct nf_conn *ct, int act, struct sk_buff *skb)
 	#ifdef CONFIG_HARDWARE_NAT_DEBUG
 	/*2007-12-19*/
 	DEBUGP("%s:%d:(%s): errno=%d\n %s (%u.%u.%u.%u:%u -> %u.%u.%u.%u:%u) g:(%u.%u.%u.%u:%u)\n",
-			__FUNCTION__,__LINE__,((is_add)?"add_nat": "del_nat"), rc, ((proto)? "tcp": "udp"), 
-			NIPQUAD(sip), sp, NIPQUAD(dip), dp, NIPQUAD(gip), gp);	
+			__FUNCTION__,__LINE__,((is_add)?"add_nat": "del_nat"), rc, ((proto)? "tcp": "udp"),
+			NIPQUAD(sip), sp, NIPQUAD(dip), dp, NIPQUAD(gip), gp);
 	#endif
 
-	return 0;	
+	return 0;
 }
 
 /* return value:
@@ -278,23 +283,24 @@ int rtl865x_handle_nat(struct nf_conn *ct, int act, struct sk_buff *skb)
 */
 int rtl_hwnat_timer_update(struct nf_conn *ct)
 {
-	unsigned long expires, now;
+	unsigned long expires, now, elasped;
 	struct nf_conn_nat *nat;
 
 	if (gHwNatEnabled!=1)
 		return FAILED;
-	
-	nat = nfct_nat(ct);	
+
+	nat = nfct_nat(ct);
 	if (nat==NULL || nat->hw_acc!=1)
 		return FAILED;
-	
+
 	now = jiffies;
 	//read_lock_bh(&nf_conntrack_lock);
 	if (ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum == IPPROTO_UDP)	{
-		if(ct->status & IPS_SEEN_REPLY)
+		if(ct->status & IPS_SEEN_REPLY) {
 			expires = nf_ct_udp_timeout_stream;
-		else
-			expires = nf_ct_udp_timeout;	
+		} else {
+			expires = nf_ct_udp_timeout;
+		}
 	} else if (ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum == IPPROTO_TCP &&
 		ct->proto.tcp.state < TCP_CONNTRACK_LAST_ACK) {
 		expires = tcp_get_timeouts_by_state(ct->proto.tcp.state);
@@ -303,45 +309,67 @@ int rtl_hwnat_timer_update(struct nf_conn *ct)
 		return FAILED;
 	}
 	//read_unlock_bh(&nf_conntrack_lock);
-	
-	if (!rtl865x_handle_nat(ct, 2, NULL)) {
+
+	elasped = rtl865x_handle_nat(ct, 2, NULL);
+	if (elasped>=0 && (elasped*HZ)<expires) {
 		/* update ct expires time */
-		ct->timeout.expires = now+expires;
-		rtl_check_for_acc(ct, (now+expires));
+		ct->timeout.expires = now+(expires-(elasped*HZ));
+		rtl_check_for_acc(ct, ct->timeout.expires);
 		return SUCCESS;
-	} else
+	} else {
 		return FAILED;
+	}
 
 }
 #endif
 
-
-#if defined(CONFIG_RTL_IPTABLES_FAST_PATH) || defined(CONFIG_RTL_HARDWARE_NAT)
-int smart_count=0;
-unsigned long smart_count_start_timer;
-unsigned int _br0_ip;
-unsigned int _br0_mask;
-static void get_br0_ip_mask(void)
+int get_dev_ip_mask(const char * name, unsigned int *ip, unsigned int *mask)
 {
-	struct in_device *in_dev;	
+	struct in_device *in_dev;
 	struct net_device *landev;
 	struct in_ifaddr *ifap = NULL;
 	
-      	if ((landev = __dev_get_by_name(&init_net, RTL_PS_BR0_DEV_NAME)) != NULL){
+	if((name == NULL) || (ip==NULL) || (mask == NULL)) 
+	{
+		return -1;
+	}
+	
+	if ((landev = __dev_get_by_name(&init_net, name)) != NULL)
+	{
 		in_dev=(struct in_device *)(landev->ip_ptr);
-		if (in_dev != NULL) {
-			for (ifap=in_dev->ifa_list; ifap != NULL; ifap=ifap->ifa_next) {
-				if (strcmp(RTL_PS_BR0_DEV_NAME, ifap->ifa_label) == 0){
-					_br0_ip = ifap->ifa_address;
-					_br0_mask = ifap->ifa_mask;
-					return; 
+		if (in_dev != NULL) 
+		{
+			for (ifap=in_dev->ifa_list; ifap != NULL; ifap=ifap->ifa_next)
+			{
+				if (strcmp(name, ifap->ifa_label) == 0)
+				{
+					*ip = ifap->ifa_address;
+					*mask = ifap->ifa_mask;
+					return 0;
 				}
 			}
-			
+
 		}
-	}	
+	}
+
+	return -1;
 }
 
+
+#if defined(CONFIG_RTL_IPTABLES_FAST_PATH) || defined(CONFIG_RTL_HARDWARE_NAT) || defined(CONFIG_RTL_WLAN_DOS_FILTER)
+unsigned int _br0_ip;
+unsigned int _br0_mask;
+static void get_br0_ip_mask(void)
+{
+
+	get_dev_ip_mask(RTL_PS_BR0_DEV_NAME, &_br0_ip, &_br0_mask);
+}
+#endif
+
+#if defined(CONFIG_RTL_IPTABLES_FAST_PATH) || defined(CONFIG_RTL_HARDWARE_NAT)
+int smart_count=0;
+unsigned long smart_count_start_timer;
+
 /* return value:
 	FAILED:			ct should be delete
 	SUCCESS:		ct should NOT be delete.
@@ -352,10 +380,13 @@ void rtl_delConnCache(struct nf_conn *ct)
 	enum NP_PROTOCOL protocol;
 	rtl_fp_napt_entry rtlFpNaptEntry;
 	#endif
-	#ifdef CONFIG_RTL_HARDWARE_NAT 
+	#ifdef CONFIG_RTL_HARDWARE_NAT
 	struct nf_conn_nat *nat;
 	#endif
-
+#if defined(CONFIG_RTL_NF_CONNTRACK_GARBAGE_NEW)
+	if (ct->removed == 1) // this ct's fastpath entry was already deleted.
+		return;
+#endif
 	if (ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum == IPPROTO_TCP) {
 		#if defined(CONFIG_RTL_IPTABLES_FAST_PATH)
 		protocol = NP_TCP;
@@ -377,7 +408,7 @@ void rtl_delConnCache(struct nf_conn *ct)
 	#endif
 
 	#if defined(CONFIG_RTL_IPTABLES_FAST_PATH)
-	if(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip 
+	if(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip
 		   == ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip) {
 		   /*case  WAN->LAN(BC->AB) use C|A-B*/
 
@@ -388,16 +419,16 @@ void rtl_delConnCache(struct nf_conn *ct)
 		rtlFpNaptEntry.extPort=ntohs(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u.all);
 		rtlFpNaptEntry.remIp=ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
 		rtlFpNaptEntry.remPort=ntohs(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u.all);
-			
+
 		#ifdef CONFIG_FAST_PATH_MODULE
 		if(FastPath_hook4!=NULL)
 		{
-			FastPath_hook4(&rtlFpNaptEntry) ;	
+			FastPath_hook4(&rtlFpNaptEntry) ;
 		}
 		#else
-		rtk_delNaptConnection(&rtlFpNaptEntry) ;		
+		rtk_delNaptConnection(&rtlFpNaptEntry) ;
 		#endif
-	}	else if (ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip 
+	}	else if (ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip
 			== ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip) {
 		/*case  LAN->WAN(AB->BC) use A|C-B*/
 
@@ -408,7 +439,7 @@ void rtl_delConnCache(struct nf_conn *ct)
 		rtlFpNaptEntry.extPort=ntohs(ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u.all);
 		rtlFpNaptEntry.remIp=ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip;
 		rtlFpNaptEntry.remPort=ntohs(ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u.all);
-		
+
 		#ifdef CONFIG_FAST_PATH_MODULE
 		if(FastPath_hook4!=NULL)
 		{
@@ -419,6 +450,10 @@ void rtl_delConnCache(struct nf_conn *ct)
 		#endif
 	}
 	#endif
+
+#if defined(CONFIG_RTL_NF_CONNTRACK_GARBAGE_NEW)
+	ct->removed = 1; // set this ct has delete fastpath entry
+#endif
 	spin_unlock_bh(&nf_conntrack_lock);
 }
 
@@ -453,7 +488,7 @@ int32 rtl_connCache_timer_update(struct nf_conn *ct)
 	spin_lock_bh(&nf_conntrack_lock);
 	if (time_after_eq(jiffies, ct->timeout.expires)) {
 		#if defined(CONFIG_RTL_IPTABLES_FAST_PATH)
-		if (SUCCESS==rtl_fpTimer_update(ct)) {
+		if (SUCCESS==rtl_fpTimer_update((void*)ct)) {
 			add_timer(&ct->timeout);
 			spin_unlock_bh(&nf_conntrack_lock);
 			return SUCCESS;
@@ -472,14 +507,14 @@ int32 rtl_connCache_timer_update(struct nf_conn *ct)
 	return FAILED;
 }
 
-#if defined(IMPROVE_QOS) 
+#if defined(IMPROVE_QOS)
 /*
  * ### for iperf application test ###
  * the behavior of iperf UDP test is LAN PC (client) will burst UDP from LAN to WAN (by one way),
  * WAN PC (server) will only send one UDP packet (statistics) at the end of test.
  * so the fastpath or hardware NAT will create link at the end of test.
  *
- * the purpose for adding the following code is to create fastpath or hardware NAT link 
+ * the purpose for adding the following code is to create fastpath or hardware NAT link
  * when we only get one packet from LAN to WAN in UDP case.
  */
 static inline int32 rtl_addConnCheck(struct nf_conn *ct, struct iphdr *iph, struct sk_buff *skb)
@@ -495,17 +530,17 @@ static inline int32 rtl_addConnCheck(struct nf_conn *ct, struct iphdr *iph, stru
 	sip = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
 	dip = ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip;
 	create_conn = FALSE;
-	
-	if (((ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip 
+
+	if (((ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip
 			 == ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip) ||
-			(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip 
+			(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip
 			 == ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip))
 	#if defined(UNNUMBER_IP)
 		 && (is_unnumber_ip(dip)==FALSE)
 	#endif
 	) {
 		/* UDP and "LAN to WAN" */
-		/* ignore some cases:  
+		/* ignore some cases:
 		 *	1. sip = br0's ip -----> (ex. sip 192.168.1.254 ==> dip 239.255.255.250)
 		 * 	2. (sip & br0's mask) != (br0's ip & br0's mask) -----> sip is not in br0's subnet
 		 *	3. (dip & br0's mask) =  (br0's ip & br0's mask) -----> dip is in br0's subnet
@@ -513,7 +548,7 @@ static inline int32 rtl_addConnCheck(struct nf_conn *ct, struct iphdr *iph, stru
 		 *	5. sip != gip
 		 */
 		if (iph->protocol == IPPROTO_UDP) {
-			if ((ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip 
+			if ((ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip
 					 == ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip)&&
 				(sip != _br0_ip) &&
 				((sip & _br0_mask) == (_br0_ip & _br0_mask)) &&
@@ -521,7 +556,7 @@ static inline int32 rtl_addConnCheck(struct nf_conn *ct, struct iphdr *iph, stru
 				((dip & 0xf0000000) != 0xe0000000) &&
 				(sip != (ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip))) {
 				create_conn = TRUE;
-			} else if ((ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip 
+			} else if ((ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip
 					 	== ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip)&&
 					 ((sip & _br0_mask) != (_br0_ip & _br0_mask))&&
 					 ((dip & _br0_mask) == (_br0_ip & _br0_mask))&&
@@ -530,28 +565,38 @@ static inline int32 rtl_addConnCheck(struct nf_conn *ct, struct iphdr *iph, stru
 			}
 		} else if (iph->protocol == IPPROTO_TCP) {
 			tcph=(void *) iph + iph->ihl*4;
-			if (!tcph->fin && !tcph->syn && !tcph->rst && tcph->psh==1 && 
-				tcph->ack ==1 &&  
+			if (!tcph->fin && !tcph->syn && !tcph->rst &&
+				#if !defined(CONFIG_RTL_URL_PATCH)
+				tcph->psh==1 &&
+				#endif
+				tcph->ack ==1 &&
 				(((ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip==ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip) &&
 				(iph->daddr !=_br0_ip) && ((sip & _br0_mask) == (_br0_ip & _br0_mask)) &&
 				((dip & _br0_mask) != (_br0_ip & _br0_mask)) && (sip != (ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip)))||
 				((ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip==ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip) &&
-				((sip & _br0_mask) != (_br0_ip & _br0_mask)) && 
+				((sip & _br0_mask) != (_br0_ip & _br0_mask)) &&
 				((dip & _br0_mask) == (_br0_ip & _br0_mask))&& (sip == iph->saddr)))) {
 
-				if (smart_count==0) {
-					smart_count_start_timer = jiffies+HZ;
-				}
-				
+				#if defined(CONFIG_RTL_URL_PATCH)
+				if((ntohs(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u.all) == URL_PROTO_PORT) ||
+				   ((ntohs(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u.all) != URL_PROTO_PORT) &&
+				    (tcph->psh==1)))
+				#endif
+				{
+					if (smart_count==0) {
+						smart_count_start_timer = jiffies+HZ;
+					}
+
 				if (time_after(jiffies, smart_count_start_timer)) {
 					smart_count_start_timer = jiffies+HZ;
 					smart_count=0;
 				}
 
-				smart_count++;
-				if(smart_count >810){
-					//panic_printk("the case hit for mart flow:tcp state=%d, assured=%d\n",ct->proto.tcp.state,test_bit(IPS_ASSURED_BIT, &ct->status));
-					create_conn=TRUE;
+					smart_count++;
+					if(smart_count >810){
+						//panic_printk("the case hit for mart flow:tcp state=%d, assured=%d\n",ct->proto.tcp.state,test_bit(IPS_ASSURED_BIT, &ct->status));
+						create_conn=TRUE;
+					}
 				}
 			}
 		} else {
@@ -559,8 +604,8 @@ static inline int32 rtl_addConnCheck(struct nf_conn *ct, struct iphdr *iph, stru
 		}
 
 #if defined(UNNUMBER_IP)
-		if ((!create_conn) 
-			&& (is_unnumber_ip(sip)==TRUE)) 
+		if ((!create_conn)
+			&& (is_unnumber_ip(sip)==TRUE))
 			){
 				create_conn = TRUE;
 		}
@@ -570,6 +615,70 @@ static inline int32 rtl_addConnCheck(struct nf_conn *ct, struct iphdr *iph, stru
 	return create_conn;
 }
 
+#if defined(CONFIG_RTL_AVOID_ADDING_WLAN_PKT_TO_HW_NAT)
+static int rtl_isWlanPkt(struct nf_conn *ct)
+{
+	int ret = FALSE;
+
+#if defined(CONFIG_BRIDGE)
+	struct net_device *lan_dev = __dev_get_by_name(&init_net, RTL_PS_BR0_DEV_NAME);
+	struct net_bridge *br = netdev_priv(lan_dev);
+	struct net_bridge_fdb_entry *dst;
+	unsigned char Mac[6];
+	__be32 intIp;
+
+	if(ct->status & IPS_SRC_NAT){
+		intIp = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
+	}else if(ct->status & IPS_DST_NAT){
+		intIp = ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip;
+	}
+
+	if((intIp & _br0_mask) == (_br0_ip & _br0_mask)){
+		if(arp_req_get_ha(intIp, lan_dev, Mac)==0){
+			if((dst = __br_fdb_get(br, Mac))!=NULL){
+				if(!memcmp(dst->dst->dev->name, "wlan", strlen("wlan")))
+							return TRUE;
+			}
+		}
+	}
+
+#endif
+
+	return ret;
+}
+
+
+static int rtl_checkLanIp(struct nf_conn *ct)
+{
+
+	__be32 lanIp=0;
+
+	if(ct->status & IPS_SRC_NAT)
+	{
+		lanIp = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
+	}
+	else if(ct->status & IPS_DST_NAT)
+	{
+		lanIp = ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip;
+	}
+	else
+	{
+		return FAILED;
+	}
+
+
+	if(rtl865x_isEthArp(lanIp)==TRUE)
+	{
+
+		return SUCCESS;
+	}
+
+
+	return FAILED;
+}
+
+#endif
+
 void rtl_addConnCache(struct nf_conn *ct, struct sk_buff *skb)
 {
 	int assured;
@@ -586,16 +695,16 @@ void rtl_addConnCache(struct nf_conn *ct, struct sk_buff *skb)
 	iph=ip_hdr(skb);
 	if (iph->protocol== IPPROTO_TCP) {
 		assured = ((ct->proto.tcp.state==TCP_CONNTRACK_ESTABLISHED)&&
-					(test_bit(IPS_DST_NAT_DONE_BIT, &ct->status) || 
+					(test_bit(IPS_DST_NAT_DONE_BIT, &ct->status) ||
 					test_bit(IPS_SRC_NAT_DONE_BIT, &ct->status)));
 
 		#if defined(CONFIG_RTL_IPTABLES_FAST_PATH)
 		protocol = NP_TCP;
 		#endif
 	} else if (iph->protocol== IPPROTO_UDP) {
-		assured = (test_bit(IPS_DST_NAT_DONE_BIT, &ct->status) || 
+		assured = (test_bit(IPS_DST_NAT_DONE_BIT, &ct->status) ||
 				test_bit(IPS_SRC_NAT_DONE_BIT, &ct->status));
-		
+
 		#if defined(CONFIG_RTL_IPTABLES_FAST_PATH)
 		protocol = NP_UDP;
 		#endif
@@ -603,23 +712,28 @@ void rtl_addConnCache(struct nf_conn *ct, struct sk_buff *skb)
 		return;
 	}
 
-	
+
+#if defined(CONFIG_RTL_URL_PATCH)
+	if((protocol == NP_TCP)&&(ntohs(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u.all) == URL_PROTO_PORT)&&assured)
+		assured = 0;
+#endif
+
 	if (!assured) {
 	        create_conn = rtl_addConnCheck(ct, iph, skb);
 	} else
 		create_conn = 0;
 
 	#if defined(CONFIG_RTL_IPTABLES_FAST_PATH)
-	/*1.add "!(ct->helper)" to fix ftp-cmd type packet 
-	  2.add identify case LAN->WAN(AB->BC) or WAN->LAN(BC->AB) 
+	/*1.add "!(ct->helper)" to fix ftp-cmd type packet
+	  2.add identify case LAN->WAN(AB->BC) or WAN->LAN(BC->AB)
 	  3.add !(ct->nat.info.helper) for best ALG avoid
 	  */
 	if (assured || create_conn) {
-		if(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip 
+		if(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip
 			== ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip) {
 			/*case BC->AB*/
 			/* wan->lan */
-			
+
 			rtlFpNaptEntry.protocol=protocol;
 			rtlFpNaptEntry.intIp=ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip;
 			rtlFpNaptEntry.intPort=ntohs(ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u.all);
@@ -627,20 +741,20 @@ void rtl_addConnCache(struct nf_conn *ct, struct sk_buff *skb)
 			rtlFpNaptEntry.extPort=ntohs(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u.all);
 			rtlFpNaptEntry.remIp=ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
 			rtlFpNaptEntry.remPort=ntohs(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u.all);
-			
+
 			#ifdef CONFIG_FAST_PATH_MODULE
 			if(FastPath_hook6!=NULL)
 			{
 				FastPath_hook6(&rtlFpNaptEntry,
-					skb, ct, 
-					NP_NONE);					
+					skb, ct,
+					NP_NONE);
 			}
 			#else
 			rtk_addNaptConnection(&rtlFpNaptEntry,
-				skb, ct, 
-				NP_NONE);		
+				(void *)skb, (void*)ct,
+				NP_NONE);
 			#endif
-		} else if (ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip 
+		} else if (ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip
 			== ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip) {
 			/*case AB->BC*/
 			/* lan->wan */
@@ -652,17 +766,17 @@ void rtl_addConnCache(struct nf_conn *ct, struct sk_buff *skb)
 			rtlFpNaptEntry.extPort=ntohs(ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u.all);
 			rtlFpNaptEntry.remIp=ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip;
 			rtlFpNaptEntry.remPort=ntohs(ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u.all);
-			
+
 			#ifdef CONFIG_FAST_PATH_MODULE
 			if(FastPath_hook6!=NULL)
 			{
 				FastPath_hook6(&rtlFpNaptEntry,
-					skb, ct, 
+					skb, ct,
 					NP_NONE);
 			}
 			#else
 			rtk_addNaptConnection(&rtlFpNaptEntry,
-				skb, ct, 
+				skb, ct,
 				NP_NONE);
 			#endif
 		}
@@ -675,18 +789,32 @@ void rtl_addConnCache(struct nf_conn *ct, struct sk_buff *skb)
 	if (assured || create_conn)
 	#endif
 	{
+		#if defined(CONFIG_RTL_AVOID_ADDING_WLAN_PKT_TO_HW_NAT)
+		//if(rtl_isWlanPkt(ct) == TRUE)
+		//	return;
+		if(rtl_checkLanIp(ct)==SUCCESS)
+		{
+			rtl865x_handle_nat(ct, 1, skb);
+		}
+		#else
 		rtl865x_handle_nat(ct, 1, skb);
+		#endif
+
 	}
 	#endif
 }
-#else	/* !defined(IMPROVE_QOS)  */
+
+#endif  /* defined(IMPROVE_QOS)  */
+
+#if defined(CONFIG_RTL_IPTABLES_FAST_PATH)
+#if !defined(IMPROVE_QOS) ||defined(CONFIG_RTL_ROUTER_FAST_PATH)
 /*
  * ### for iperf application test ###
  * the behavior of iperf UDP test is LAN PC (client) will burst UDP from LAN to WAN (by one way),
  * WAN PC (server) will only send one UDP packet (statistics) at the end of test.
  * so the fastpath or hardware NAT will create link at the end of test.
  *
- * the purpose for adding the following code is to create fastpath or hardware NAT link 
+ * the purpose for adding the following code is to create fastpath or hardware NAT link
  * when we only get one packet from LAN to WAN in UDP case.
  */
 static int32 rtl_fpAddConnCheck(struct nf_conn *ct, struct iphdr *iph, struct sk_buff *skb)
@@ -700,8 +828,8 @@ static int32 rtl_fpAddConnCheck(struct nf_conn *ct, struct iphdr *iph, struct sk
 	sip = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
 	dip = ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip;
 	create_conn = FALSE;
-	
-	if ((ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip 
+
+	if ((ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip
 		 == ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip)
 	#if defined(UNNUMBER_IP)
 		 && (is_unnumber_ip(dip)==FALSE)
@@ -710,10 +838,12 @@ static int32 rtl_fpAddConnCheck(struct nf_conn *ct, struct iphdr *iph, struct sk
 		/* lan -> wan */
 		if (iph->protocol == IPPROTO_UDP &&
 			(sip != _br0_ip) &&
-			((sip & _br0_mask) == (_br0_ip & _br0_mask)) &&
-			((dip & _br0_mask) != (_br0_ip & _br0_mask)) &&
+			((((sip & _br0_mask) == (_br0_ip & _br0_mask)) &&
+			((dip & _br0_mask) != (_br0_ip & _br0_mask))) ||
+			(((sip & _br0_mask) != (_br0_ip & _br0_mask))&&
+			((dip & _br0_mask) == (_br0_ip & _br0_mask))))&&
 			(!IS_CLASSD_ADDR(dip)) &&
-			(sip != (ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip))
+			((routerTypeFlag == 1) ||(sip != (ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip)))
 			) {
 			create_conn = TRUE;
 			/* copied from last 2 line of this function **/
@@ -724,14 +854,18 @@ static int32 rtl_fpAddConnCheck(struct nf_conn *ct, struct iphdr *iph, struct sk
 			set_bit(IPS_ASSURED_BIT, &ct->status);
 		} else if (iph->protocol == IPPROTO_TCP) {
 			tcph=(void *) iph + iph->ihl*4;
-			if (!tcph->fin && !tcph->syn && !tcph->rst && tcph->psh==1 && 
-				tcph->ack ==TRUE &&  (iph->daddr !=_br0_ip) && ((sip & _br0_mask) == (_br0_ip & _br0_mask)) &&
-				((dip & _br0_mask) != (_br0_ip & _br0_mask)) && (sip != (ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip))) { 
-
+			if (!tcph->fin && !tcph->syn && !tcph->rst && tcph->psh==1 &&
+				tcph->ack ==TRUE &&  (iph->daddr !=_br0_ip) &&
+				((((sip & _br0_mask) == (_br0_ip & _br0_mask)) &&
+				((dip & _br0_mask) != (_br0_ip & _br0_mask))) ||
+				(((sip & _br0_mask) != (_br0_ip & _br0_mask))&&
+				((dip & _br0_mask) == (_br0_ip & _br0_mask))))&&
+				((routerTypeFlag == 1) || (sip != (ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip)))
+				) {
 				if (smart_count==0) {
 					smart_count_start_timer = jiffies+HZ;
 				}
-				
+
 				if (time_after(jiffies, smart_count_start_timer)) {
 					smart_count_start_timer = jiffies+HZ;
 					smart_count=0;
@@ -748,8 +882,8 @@ static int32 rtl_fpAddConnCheck(struct nf_conn *ct, struct iphdr *iph, struct sk
 		}
 
 #if defined(UNNUMBER_IP)
-		if ((!create_conn) 
-			&& (is_unnumber_ip(sip)==TRUE)) 
+		if ((!create_conn)
+			&& (is_unnumber_ip(sip)==TRUE))
 			){
 				create_conn = TRUE;
 		}
@@ -769,13 +903,13 @@ void rtl_fpAddConnCache(struct nf_conn *ct, struct sk_buff *skb)
 
 	if (nfct_help(ct))
 		return;
-	
+
 	iph=ip_hdr(skb);
 	create_conn = rtl_fpAddConnCheck(ct, iph, skb);
 	assured = test_bit(IPS_ASSURED_BIT, &ct->status);
-	
-	/*1.add "!(ct->helper)" to fix ftp-cmd type packet 
-	  2.add identify case LAN->WAN(AB->BC) or WAN->LAN(BC->AB) 
+
+	/*1.add "!(ct->helper)" to fix ftp-cmd type packet
+	  2.add identify case LAN->WAN(AB->BC) or WAN->LAN(BC->AB)
 	  3.add !(ct->nat.info.helper) for best ALG avoid
 	  */
 
@@ -787,8 +921,13 @@ void rtl_fpAddConnCache(struct nf_conn *ct, struct sk_buff *skb)
 			protocol = NP_UDP;
 		}
 
-		if(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip 
-			== ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip) {
+
+#if !defined(IMPROVE_QOS)
+	if(((!rtl_isRouterType(ct)) && rtl_isNatTypeWantoLan(ct)) ||rtl_isRouterTypeWantoLan(ct))
+#else
+	if(rtl_isRouterTypeWantoLan(ct))
+#endif
+		{
 			/*case BC->AB*/
 			/* wan->lan */
 
@@ -799,19 +938,30 @@ void rtl_fpAddConnCache(struct nf_conn *ct, struct sk_buff *skb)
 			rtlFpNaptEntry.extPort=ntohs(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u.all);
 			rtlFpNaptEntry.remIp=ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
 			rtlFpNaptEntry.remPort=ntohs(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u.all);
-			
+
 			#ifdef CONFIG_FAST_PATH_MODULE
 			if(FastPath_hook6!=NULL)
 			{
 				FastPath_hook6(&rtlFpNaptEntry,
-					NP_NONE);					
+				#if defined(IMPROVE_QOS)
+				skb, ct,
+				#endif
+					NP_NONE);
 			}
 			#else
 			rtk_addNaptConnection(&rtlFpNaptEntry,
-				NP_NONE);		
+							#if defined(IMPROVE_QOS)
+							(void*)skb, (void*)ct,
+							#endif
+							NP_NONE);
 			#endif
-		} else if (ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip 
-			== ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip) {
+		}
+#if !defined(IMPROVE_QOS)
+	else if(((!rtl_isRouterType(ct)) && rtl_isNatTypeLantoWan(ct)) ||rtl_isRouterTypeLantoWan(ct))
+#else
+	else if(rtl_isRouterTypeLantoWan(ct))
+#endif
+		{
 			/*case AB->BC*/
 			/* lan->wan */
 
@@ -822,15 +972,21 @@ void rtl_fpAddConnCache(struct nf_conn *ct, struct sk_buff *skb)
 			rtlFpNaptEntry.extPort=ntohs(ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u.all);
 			rtlFpNaptEntry.remIp=ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip;
 			rtlFpNaptEntry.remPort=ntohs(ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u.all);
-			
+
 			#ifdef CONFIG_FAST_PATH_MODULE
 			if(FastPath_hook6!=NULL)
 			{
 				FastPath_hook6(&rtlFpNaptEntry,
+					#if defined(IMPROVE_QOS)
+					skb, ct,
+					#endif
 					NP_NONE);
 			}
 			#else
 			rtk_addNaptConnection(&rtlFpNaptEntry,
+				#if defined(IMPROVE_QOS)
+				skb, ct,
+				#endif
 				NP_NONE);
 			#endif
 		}
@@ -838,10 +994,11 @@ void rtl_fpAddConnCache(struct nf_conn *ct, struct sk_buff *skb)
 
 }
 #endif	/* defined(IMPROVE_QOS)  */
-
 #endif
+#endif
+
 
-#if defined(CONFIG_PROC_FS) && defined(CONFIG_RTL_HARDWARE_NAT )
+#if defined(CONFIG_PROC_FS) && defined(CONFIG_RTL_HARDWARE_NAT)
 static struct proc_dir_entry *proc_hw_nat=NULL;
 static char gHwNatSetting[16];
 //extern unsigned int ldst, lmask, wdst, wmask;
@@ -864,18 +1021,24 @@ static int hw_nat_read_proc(char *page, char **start, off_t off,
 static int hw_nat_write_proc(struct file *file, const char *buffer,
 		      unsigned long count, void *data)
 {
-	if (count < 2) 
+	if (count < 2)
 		return -EFAULT;
 
 	if (buffer && !copy_from_user(&gHwNatSetting, buffer, 8)) {
-		if (gHwNatSetting[0] == '0') { /* hardware NAT disabled, operation mode = gateway */
+		if ((gHwNatSetting[0] == '-')&&(gHwNatSetting[1] == '1') ) { /* hardware NAT disabled, operation mode = gateway */
 			gHwNatEnabled = 0;
-			rtl865x_nat_reinit();			
+			rtl865x_nat_reinit();
 			rtl865x_reChangeOpMode();
 			//rtl8651_setAsicOperationLayer(4);
 		}
+		else if (gHwNatSetting[0] == '0') { /* hardware NAT disabled, operation mode = gateway */
+			gHwNatEnabled = 0;
+			rtl865x_nat_reinit();
+			rtl865x_changeOpMode(GATEWAY_MODE);
+			//rtl8651_setAsicOperationLayer(4);
+		}
 		else if (gHwNatSetting[0] == '1') { /* hardware NAT enabled, operation mode = gateway */
-			
+
 			rtl865x_changeOpMode(GATEWAY_MODE);
 			//rtl8651_setAsicOperationLayer(4);
 			gHwNatEnabled = 1;
@@ -902,14 +1065,22 @@ static int hw_nat_write_proc(struct file *file, const char *buffer,
 		else if (gHwNatSetting[0] == '9') {
 			get_br0_ip_mask();
 		}
+		else if(gHwNatSetting[0] == '7'){
+			routerTypeFlag = 1;
+		}
 		#endif
+	
+		if((count>0)&& (count<sizeof(gHwNatSetting)))
+		{
+			gHwNatSetting[count]=0;
+		}
 		return count;
 	}
 	return -EFAULT;
 }
 #endif
 
-#if defined(CONFIG_RTL_819X) && (defined(CONFIG_PROC_FS) && !defined(CONFIG_RTL_HARDWARE_NAT))
+#if defined(CONFIG_RTL_819X_SWCORE) && (defined(CONFIG_PROC_FS) && !defined(CONFIG_RTL_HARDWARE_NAT))
 static struct proc_dir_entry *proc_sw_nat=NULL;
 static char gSwNatSetting[16];
 
@@ -931,9 +1102,9 @@ static int sw_nat_read_proc(char *page, char **start, off_t off,
 static int sw_nat_write_proc(struct file *file, const char *buffer,
 		      unsigned long count, void *data)
 {
-	if (count < 2) 
+	if (count < 2)
 		return -EFAULT;
-      
+
 	if (buffer && !copy_from_user(&gSwNatSetting, buffer, 8)) {
 		if (gSwNatSetting[0] == '0'){  /* operation mode = GATEWAY */
 			//SoftNAT_OP_Mode(2);
@@ -949,18 +1120,33 @@ static int sw_nat_write_proc(struct file *file, const char *buffer,
 			rtl865x_changeOpMode(WISP_MODE);
 			//rtl8651_setAsicOperationLayer(2);
 		}
-#if defined(CONFIG_RTL_HARDWARE_NAT) || defined(CONFIG_RTL_IPTABLES_FAST_PATH)
+#if defined(CONFIG_RTL_HARDWARE_NAT) || defined(CONFIG_RTL_IPTABLES_FAST_PATH) || defined(CONFIG_RTL_WLAN_DOS_FILTER)
 		else if(gSwNatSetting[0] == '9'){
 			get_br0_ip_mask();
 		}
+		else if(gSwNatSetting[0] == '7'){
+			routerTypeFlag = 1;
+		}
 #endif
+
+#ifdef CONFIG_RTL_WLAN_DOS_FILTER
+		else if(gSwNatSetting[0] == 'a') {
+			extern int wlan_dos_filter_enabled;
+			wlan_dos_filter_enabled = 0;
+		}
+		else if(gSwNatSetting[0] == 'b') {
+			extern int wlan_dos_filter_enabled;
+			wlan_dos_filter_enabled = 1;
+		}
+#endif
+
 		return count;
 	}
 	return -EFAULT;
 }
 #endif /* defined(CONFIG_RTL_819X) && (defined(CONFIG_PROC_FS) && !defined(CONFIG_RTL_HARDWARE_NAT))	*/
 
-#if defined(CONFIG_RTL_819X)
+#if defined(CONFIG_RTL_819X_SWCORE)
 int32 rtl_nat_init(void)
 {
 	#if defined(CONFIG_PROC_FS) && defined(CONFIG_RTL_HARDWARE_NAT)
@@ -968,9 +1154,8 @@ int32 rtl_nat_init(void)
 	if (proc_hw_nat) {
 		proc_hw_nat->read_proc = hw_nat_read_proc;
 		proc_hw_nat->write_proc = hw_nat_write_proc;
-	}  
+	}
 	#endif
-
 	#if defined(CONFIG_PROC_FS) && !defined(CONFIG_RTL_HARDWARE_NAT)
 	proc_sw_nat = create_proc_entry("sw_nat", 0, NULL);
 	if (proc_sw_nat) {
@@ -992,7 +1177,7 @@ extern int rtl865x_curOpMode;
 struct net_device *rtl865x_getWanDev(void )
 {
 	struct net_device * wanDev=NULL;
-	
+
 	if(rtl865x_curOpMode==GATEWAY_MODE)
 	{
 #if defined(CONFIG_RTL_PUBLIC_SSID)
@@ -1005,7 +1190,7 @@ struct net_device *rtl865x_getWanDev(void )
 			//Try eth1 then
 			wanDev=dev_get_by_name(&init_net,RTL_PS_WAN0_DEV_NAME);
 		}
-#endif		
+#endif
 	}
 	else if(rtl865x_curOpMode==WISP_MODE)
 	{
@@ -1021,9 +1206,9 @@ struct net_device *rtl865x_getWanDev(void )
 		wanDev=dev_get_by_name(&init_net,RTL_BR_WAN_DEVICE_NAME);
 #else
 		wanDev=dev_get_by_name(&init_net,RTL_PS_BR0_DEV_NAME);
-#endif		
+#endif
 	}
-	
+
 	return wanDev;
 }
 
@@ -1043,7 +1228,7 @@ int rtl865x_attainDevType(unsigned char *devName, unsigned int *isLanDev, unsign
 	if(rtl865x_curOpMode==GATEWAY_MODE)
 	{
 #if defined(CONFIG_RTL_PUBLIC_SSID)
-		if(strncmp(devName, RTL_PS_WAN0_DEV_NAME, 4) ==0 || strncmp(devName, RTL_GW_WAN_DEVICE_NAME, 3) ==0 || 
+		if(strncmp(devName, RTL_PS_WAN0_DEV_NAME, 4) ==0 || strncmp(devName, RTL_GW_WAN_DEVICE_NAME, 3) ==0 ||
 			rtl865x_from_public_ssid_device(devName)
 			)
 #else
@@ -1052,8 +1237,8 @@ int rtl865x_attainDevType(unsigned char *devName, unsigned int *isLanDev, unsign
 		{
 			*isWanDev=1;
 		}
-		else if(	(strncmp(devName, RTL_PS_BR0_DEV_NAME, 3) ==0)||	
-				(strncmp(devName, RTL_PS_ETH_NAME, 3) ==0) || 	
+		else if(	(strncmp(devName, RTL_PS_BR0_DEV_NAME, 3) ==0)||
+				(strncmp(devName, RTL_PS_ETH_NAME, 3) ==0) ||
 				(strncmp(devName, RTL_PS_WLAN_NAME, 4) ==0))
 		{
 			*isLanDev=1;
@@ -1062,7 +1247,7 @@ int rtl865x_attainDevType(unsigned char *devName, unsigned int *isLanDev, unsign
 		{
 			return -1;
 		}
-		
+
 	}
 	else if(rtl865x_curOpMode==WISP_MODE)
 	{
@@ -1097,7 +1282,7 @@ int rtl865x_attainDevType(unsigned char *devName, unsigned int *isLanDev, unsign
 	{
 		return -1;
 	}
-	
+
 	return 0;
 }
 #endif
@@ -1107,12 +1292,12 @@ int rtl865x_localPublicRx(struct sk_buff *skb)
 {
 	struct rtl865x_pktInfo pktInfo;
 	unsigned int rxFromLan, rxFromWan;
-	
+
 	if(rtl865x_localPublicEnabled() ==0)
 	{
 		goto end_of_local_public_rx;
 	}
-	
+
 	if(rtl865x_attainDevType(skb->dev->name, &rxFromLan, &rxFromWan))
 	{
 		return NET_RX_SUCCESS;
@@ -1126,10 +1311,10 @@ int rtl865x_localPublicRx(struct sk_buff *skb)
 	#if 0
 	printk("%s:%d,skb->dev->name is %s,rxFromLan is %d,rxFromWan is %d\n",__FUNCTION__,__LINE__,skb->dev->name,rxFromLan,rxFromWan);
 	printk("EtherType: 0x%x\n", *((uint16*)&skb->mac.raw[12]));
-	printk("%x:%x:%x:%x:%x:%x ==> %x:%x:%x:%x:%x:%x \n\n", 
+	printk("%x:%x:%x:%x:%x:%x ==> %x:%x:%x:%x:%x:%x \n\n",
 	skb->mac.raw[6], skb->mac.raw[7], skb->mac.raw[8],
-	skb->mac.raw[9], skb->mac.raw[10], skb->mac.raw[11], 
-	skb->mac.raw[0], skb->mac.raw[1], skb->mac.raw[2], 
+	skb->mac.raw[9], skb->mac.raw[10], skb->mac.raw[11],
+	skb->mac.raw[0], skb->mac.raw[1], skb->mac.raw[2],
 	skb->mac.raw[3], skb->mac.raw[4], skb->mac.raw[5]);
 	#endif
 	if(rxFromWan)
@@ -1140,7 +1325,7 @@ int rtl865x_localPublicRx(struct sk_buff *skb)
 		pktInfo.data=skb_mac_header(skb);
 		pktInfo.action=RX_WAN_PACKET;
 		rtl865x_checkLocalPublic(&pktInfo);
-	
+
 		if(pktInfo.fromLocalPublic==1)
 		{
 			kfree_skb(skb);
@@ -1148,12 +1333,12 @@ int rtl865x_localPublicRx(struct sk_buff *skb)
 		}
 		else if(pktInfo.toLocalPublic==1)
 		{
-	
+
 			skb->pkt_type=PACKET_HOST;
 			//printk("%s:%d,pktInfo.fromLocalPublic is %d,pktInfo.toLocalPublic is %d\n",__FUNCTION__,__LINE__,pktInfo.fromLocalPublic,pktInfo.toLocalPublic );
 			memcpy(eth_hdr(skb)->h_dest, skb->dev->dev_addr, 6);
 		 }
-		
+
 	}
 	else if (rxFromLan)
 	{
@@ -1169,7 +1354,7 @@ int rtl865x_localPublicRx(struct sk_buff *skb)
 			skb->fromLocalPublic=1;
 			skb->srcLocalPublicIp=pktInfo.srcIp;
 			//if(pktInfo.toLocalPublic==1)
-			{			
+			{
 				skb->pkt_type=PACKET_HOST;
 				memcpy(eth_hdr(skb)->h_dest, skb->dev->dev_addr, 6);
 				#if 0
@@ -1179,13 +1364,13 @@ int rtl865x_localPublicRx(struct sk_buff *skb)
 					dest[0],dest[1],dest[2],dest[3],dest[4],dest[5],
 					src[0],src[1],src[2],src[3],src[4],src[5]);
 				#endif
-				
+
 			}
 		}
-		
+
 	}
 	skb->localPublicFlags = 0x1;
-	
+
 end_of_local_public_rx:
 	return NET_RX_SUCCESS;
 }
@@ -1197,14 +1382,14 @@ int rtl865x_localPublicTx(struct sk_buff *skb, struct net_device *dev)
 	{
 		return NET_RX_SUCCESS;
 	}
-	
+
 	if(txToWan)
-	{	
+	{
 		if((skb->fromLocalPublic==1) && (skb->srcLocalPublicIp!=0))
 		{
 			rtl865x_getLocalPublicMac(skb->srcLocalPublicIp, eth_hdr(skb)->h_source);
 		}
-			
+
 	}
 	else if (txToLan)
 	{
@@ -1218,31 +1403,31 @@ int rtl865x_localPublicTx(struct sk_buff *skb, struct net_device *dev)
 
 int rtl865x_getDevIpAndNetmask(struct net_device * dev, unsigned int *ipAddr, unsigned int *netMask )
 {
-	struct in_device *in_dev;	
+	struct in_device *in_dev;
 	struct in_ifaddr *ifap = NULL;
 
 	if((dev==NULL) || (ipAddr==NULL) || (netMask==NULL))
 	{
 		return FAILED;
 	}
-	
+
 	*ipAddr=0;
 	*netMask=0;
-   
-	in_dev=(struct net_device *)(dev->ip_ptr);
+
+	in_dev=(struct in_device *)(dev->ip_ptr);
 	if (in_dev != NULL) {
 		for (ifap=in_dev->ifa_list; ifap != NULL; ifap=ifap->ifa_next) {
 			if (strcmp(dev->name, ifap->ifa_label) == 0){
 				*ipAddr = ifap->ifa_address;
 				*netMask = ifap->ifa_mask;
-				return SUCCESS; 
+				return SUCCESS;
 			}
 		}
-		
+
 	}
-	
+
 	return FAILED;
-		
+
 }
 
 
@@ -1286,7 +1471,7 @@ static int qos_read_proc(char *page, char **start, off_t off,
 static int qos_write_proc(struct file *file, const char *buffer,
 		      unsigned long count, void *data)
 {
-      if ( gQosSetting==NULL || count < 2) 
+      if ( gQosSetting==NULL || count < 2)
 	    return -EFAULT;
 
       if (buffer && !copy_from_user(gQosSetting, buffer, count)) {
@@ -1322,10 +1507,10 @@ int32 rtl_qos_init(void)
 		proc_qos->write_proc = qos_write_proc;
 	}
 	#endif
-	gQosSetting = kmalloc(RTL_QOS_PROC_MAX_LEN, GFP_KERNEL);
+	gQosSetting = kmalloc(RTL_QOS_PROC_MAX_LEN, GFP_ATOMIC);
 	memset(gQosSetting, 0, RTL_QOS_PROC_MAX_LEN);
 	gQosEnabled = 0;
-	
+
 	return SUCCESS;
 }
 
@@ -1340,11 +1525,11 @@ int32 rtl_qos_cleanup(void)
 
 #if defined(CONFIG_RTL_FAST_BRIDGE)
 int32 rtl_fb_add_br_entry(skb)
-{	
+{
 	struct net_bridge_fdb_entry *dst;
 	const unsigned char *dest = eth_hdr(skb)->h_dest;
 	if (!is_multicast_ether_addr(dest))
-	{					
+	{
 		dst = __br_fdb_get(skb->dev->br_port->br, dest);
 		if(dst != NULL && dst->dst->dev == skb->dev)
 		{
@@ -1413,7 +1598,7 @@ rtl_resolve_normal_ct(struct net *net,
 
 	/* look for tuple match */
 	h = nf_conntrack_find_get(net, &tuple);
-	
+
 	if (!h) {
 		//h = init_conntrack(net, &tuple, l3proto, l4proto, skb, dataoff);
 		//if (!h)
@@ -1487,7 +1672,7 @@ rtl_nf_conntrack_in(struct net *net, unsigned int dataoff, unsigned int hooknum,
 	}
 
 	NF_CT_ASSERT(skb->nfct);
-	
+
 
 	th = skb_header_pointer(skb, dataoff, sizeof(_tcph), &_tcph);
 	BUG_ON(th == NULL);
@@ -1536,7 +1721,7 @@ int get_hookNum(struct ipt_entry *e, unsigned char *base, const unsigned int val
 #ifdef CONFIG_RTL_LAYERED_DRIVER_L3
 	u32 arp_ip = htonl(*((u32 *)n->primary_key));
 	int rc;
-	
+
 	rc = add? rtl865x_addArp(arp_ip, (void *)n->ha): rtl865x_delArp(arp_ip);
 #endif
 	return 0;
@@ -1572,16 +1757,16 @@ rtl_masq_if rtl_masq_info[RTL_MULTIPLE_WAN_NUM];
 
 rtl_masq_if *rtl_get_masq_info_by_devName(const char* name)
 {
-	int i;	
+	int i;
 	if(name == NULL)
 		return NULL;
-	
+
 	for(i = 0; i < RTL_MULTIPLE_WAN_NUM;i++)
 	{
 		if(rtl_masq_info[i].valid == 1 &&strcmp(rtl_masq_info[i].ifName,name) == 0)
 			return &rtl_masq_info[i];
 	}
-	
+
 	return NULL;
 }
 
@@ -1590,7 +1775,7 @@ int rtl_add_masq_info(const char *name,int ipAddr)
 	int i;
 	if(strlen(name) >=IFNAMSIZ || ipAddr ==0)
 		return FAILED;
-	
+
 	for(i = 0; i < RTL_MULTIPLE_WAN_NUM;i++)
 	{
 		if(rtl_masq_info[i].valid == 0)
@@ -1604,7 +1789,7 @@ int rtl_add_masq_info(const char *name,int ipAddr)
 	rtl_masq_info[i].ipAddr = ipAddr;
 	memcpy(rtl_masq_info[i].ifName,name,strlen(name));
 	rtl_masq_info[i].ifName[strlen(name)] ='\0';
-	return SUCCESS;	
+	return SUCCESS;
 }
 
 int rtl_init_masq_info(void)
@@ -1614,7 +1799,7 @@ int rtl_init_masq_info(void)
 	{
 		memset(&rtl_masq_info[i],0,sizeof(rtl_masq_if));
 	}
-	
+
 	return SUCCESS;
 }
 
@@ -1643,26 +1828,26 @@ static int rtl_get_masquerade_netif(struct xt_table_info *private,struct ipt_ent
 	struct ipt_entry_target *t;
 	struct net_device *dev;
 	char masq_name[IFNAMSIZ]={'\0'};
-	
+
 	if(masq_entry && masq_entry->ip.outiface[0] !='\0')
-	{			
+	{
 		memcpy(masq_name, masq_entry->ip.outiface, IFNAMSIZ);
 		//return 0;
 	}
-	else	
+	else
 	{
 		table_base = private->entries[smp_processor_id()];
-		e = get_entry(table_base, private->hook_entry[NF_INET_POST_ROUTING]);		
-		back = get_entry(table_base, private->underflow[NF_INET_POST_ROUTING]);		
-		
+		e = get_entry(table_base, private->hook_entry[NF_INET_POST_ROUTING]);
+		back = get_entry(table_base, private->underflow[NF_INET_POST_ROUTING]);
+
 		//clear masq_name;
-		memset(masq_name,0,IFNAMSIZ);		
+		memset(masq_name,0,IFNAMSIZ);
 		while(e)
 		{
-		
+
 			if(e == masq_entry)
 				break;
-			
+
 			//record the entry's outif name
 			if(e->ip.outiface[0] !='\0')
 				memcpy(masq_name,e->ip.outiface,IFNAMSIZ);
@@ -1678,26 +1863,26 @@ static int rtl_get_masquerade_netif(struct xt_table_info *private,struct ipt_ent
 				memset(masq_name,0,IFNAMSIZ);
 				break;
 			}
-			
+
 			/* Standard target? */
-			if (!t->u.kernel.target->target) 
+			if (!t->u.kernel.target->target)
 			{
 				int v;
-				v = ((struct ipt_standard_target *)t)->verdict;				
-				
+				v = ((struct ipt_standard_target *)t)->verdict;
+
 				if (v < 0 )
 				{
 					if(v == IPT_RETURN)
 					{
 						e = back;
-						back = get_entry(table_base, back->comefrom);						
+						back = get_entry(table_base, back->comefrom);
 					}
 					else
 					{
 						e = (void *)e + e->next_offset;
 					}
 
-					continue;				
+					continue;
 				}
 
 				//jump ?
@@ -1713,34 +1898,34 @@ static int rtl_get_masquerade_netif(struct xt_table_info *private,struct ipt_ent
 				}
 				e = get_entry(table_base, v);
 				continue;
-			} 
-			
+			}
+
 			/*user define target?*/
 			e = (void *)e + e->next_offset;
-		}		
-		
+		}
+
 	}
 
 	if(masq_name[0] !='\0')
 	{
 		struct in_ifaddr *ina;
 		dev = __dev_get_by_name(&init_net,masq_name);
-		if ((dev)&&(dev->ip_ptr)) 
-		{ 		
-				
+		if ((dev)&&(dev->ip_ptr))
+		{
+
 			ina=(struct in_ifaddr *)(((struct in_device *)(dev->ip_ptr))->ifa_list);
-			if (ina!=NULL) 
+			if (ina!=NULL)
 			{
 				rtl_add_masq_info(masq_name,ina->ifa_local);
 			}
 		}
 	}
-		
+
 
 	return 0;
 }
 
-static int rtl_check_for_masquerade_entry(struct ipt_entry *e,  
+static int rtl_check_for_masquerade_entry(struct ipt_entry *e,
 	unsigned char *base,
 	const char *name,
 	unsigned int size,
@@ -1751,20 +1936,20 @@ static int rtl_check_for_masquerade_entry(struct ipt_entry *e,
 	struct ipt_entry_target *t;
 	unsigned int hook;
 	int ret = 0;
-	
-	t = ipt_get_target(e);	
-	if ( !t) 
-	{		
+
+	t = ipt_get_target(e);
+	if ( !t)
+	{
 		goto err;
 	}
 
-	hook = get_hookNum(e,base,valid_hooks,hook_entries);		
+	hook = get_hookNum(e,base,valid_hooks,hook_entries);
 	if ((hook == NF_INET_POST_ROUTING) &&
-		((strcmp(t->u.kernel.target->name, "MASQUERADE") == 0))) 
-		{			
-			rtl_get_masquerade_netif(private,e);	
+		((strcmp(t->u.kernel.target->name, "MASQUERADE") == 0)))
+		{
+			rtl_get_masquerade_netif(private,e);
 		}
- err:	
+ err:
 	return ret;
 }
 
@@ -1788,7 +1973,7 @@ int rtl_check_for_extern_ip(const char *name,
 			rtl865x_addIp(0,rtl_masq_info[i].ipAddr,IP_TYPE_NAPT);
 		}
 	}
-	
+
 	return 0;
 }
 
@@ -1803,33 +1988,33 @@ int rtl_check_for_extern_ip(const char *name,
 			rtl865x_delIp(rtl_masq_info[i].ipAddr);
 		}
 	}
-	
+
 	return SUCCESS;
 }
 
 int32 rtl_update_ip_tables(char *name,  unsigned long event, struct in_ifaddr *ina)
 {
 	rtl_masq_if *entry;
-	
+
 	/*2007-12-19*/
 	#ifdef CONFIG_HARDWARE_NAT_DEBUG
 		/*2007-12-19*/
 		printk("%s:%d\n",__FUNCTION__,__LINE__);
-	#endif	
+	#endif
 	if (ina==NULL)
 		return SUCCESS;
-	
+
 	entry = rtl_get_masq_info_by_devName(name);
 	if (entry!=NULL)
 	{
-		if (event == NETDEV_UP ) 
+		if (event == NETDEV_UP )
 		{
 			rtl865x_addIp(0,(u32)(ina->ifa_local),IP_TYPE_NAPT);
 			//update the ip address
 			entry->ipAddr = ina->ifa_local;
 		}
-		else if(event == NETDEV_DOWN) 
-		{				
+		else if(event == NETDEV_DOWN)
+		{
 			if(rtl865x_delIp(ina->ifa_local)==SUCCESS)
 			{
 				rtl865x_nat_init();
@@ -1847,7 +2032,7 @@ int32 rtl_fn_insert(struct fib_table *tb, struct fib_config *cfg, struct fib_inf
 	unsigned int srcIp,srcMask;
 	struct net_device *netif;
 	char *dev_t;
-	
+
 	/*2007-12-19*/
 	if ((tb->tb_id == RT_TABLE_MAIN) && (gHwNatEnabled !=0)) {
 		if(cfg->fc_oif) {
@@ -1861,8 +2046,8 @@ int32 rtl_fn_insert(struct fib_table *tb, struct fib_config *cfg, struct fib_inf
 		ipMask = inet_make_mask(cfg->fc_dst_len);
 		ipGw = cfg->fc_gw;
 		rtl865x_getDevIpAndNetmask(netif,&srcIp,&srcMask);
-		if (!ipDst || (!MULTICAST(ipDst) && !LOOPBACK(ipDst) && (ipDst != 0xffffffff))) 
-		{ 
+		if (!ipDst || (!MULTICAST(ipDst) && !LOOPBACK(ipDst) && (ipDst != 0xffffffff)))
+		{
 			#ifdef CONFIG_RTL_LAYERED_DRIVER_L3
 			//printk("-------------------%s(%d)\n",__FUNCTION__,__LINE__);
 			rc = rtl865x_addRoute(ipDst,ipMask,ipGw,dev_t,srcIp);
@@ -1870,7 +2055,7 @@ int32 rtl_fn_insert(struct fib_table *tb, struct fib_config *cfg, struct fib_inf
 			#endif
 	        	#ifdef CONFIG_HARDWARE_NAT_DEBUG
 			/*2007-12-19*/
-			printk("%s:%d:(%s): dst:%u.%u.%u.%u/%u, gw:%u.%u.%u.%u, dev: %s, errno=%d\n", 
+			printk("%s:%d:(%s): dst:%u.%u.%u.%u/%u, gw:%u.%u.%u.%u, dev: %s, errno=%d\n",
 				__FUNCTION__,__LINE__,"add_rt",  NIPQUAD(ipDst), cfg->fc_dst_len, NIPQUAD(ipGw), dev_t? dev_t: "null", rc
 		);
 		#endif
@@ -1885,13 +2070,13 @@ int32 rtl_fn_delete(struct fib_table *tb, struct fib_config *cfg)
 {
 	int rc;
 	unsigned int ipDst, ipMask;
-	
+
 	/*2007-12-19*/
 	if (tb->tb_id == RT_TABLE_MAIN) {
 		ipDst = cfg->fc_dst;
 		ipMask =  inet_make_mask(cfg->fc_dst_len);
-		
-		if (!ipDst || (!MULTICAST(ipDst) && !LOOPBACK(ipDst) && (ipDst != 0xffffffff))) { 
+
+		if (!ipDst || (!MULTICAST(ipDst) && !LOOPBACK(ipDst) && (ipDst != 0xffffffff))) {
 			rc = 0;
 			#ifdef CONFIG_RTL_LAYERED_DRIVER_L3
 			rc = rtl865x_delRoute(ipDst, ipMask);
@@ -1907,11 +2092,11 @@ int32 rtl_fn_flush(int	 fz_order, int idx, u32 tb_id, u32 fn_key)
 	int rc;
 	unsigned int ipDst, ipMask;
 	/*2007-12-19*/
-	if (tb_id==RT_TABLE_MAIN) {			
+	if (tb_id==RT_TABLE_MAIN) {
 		ipDst =fn_key;
 		ipMask = inet_make_mask(fz_order);
 
-		if (!ipDst || (!MULTICAST(ipDst) && !LOOPBACK(ipDst) && (ipDst != 0xffffffff))) { 
+		if (!ipDst || (!MULTICAST(ipDst) && !LOOPBACK(ipDst) && (ipDst != 0xffffffff))) {
 			rc = 0;
 			#ifdef CONFIG_RTL_LAYERED_DRIVER_L3
 			rc = rtl865x_delRoute(ipDst, ipMask);
@@ -1924,12 +2109,21 @@ int32 rtl_fn_flush(int	 fz_order, int idx, u32 tb_id, u32 fn_key)
 
 int32 rtl_ip_vs_conn_expire_check(struct ip_vs_conn *cp)
 {
-	int timeval;
+	int elapsed;
+	u_int32_t expires;
 	rtl865x_napt_entry rtl865xNaptEntry;
 
+	if (cp->protocol==IPPROTO_UDP)	{
+		expires = nf_ct_udp_timeout;
+	} else if (cp->protocol==IPPROTO_TCP) {
+		expires = tcp_get_timeouts_by_state(cp->state);	/* does cp->state right here? */
+	} else {
+		return FAILED;
+	}
+
 /*   chhuang:
 	printk("ip_vs_conn_expire: c:(%u.%u.%u.%u:%d), v:(%u.%u.%u.%u:%d), \n\td:(%u.%u.%u.%u:%d), p:(%x), f: %x, s: %x\n",
-			NIPQUAD(cp->caddr), cp->cport, NIPQUAD(cp->vaddr), cp->vport, NIPQUAD(cp->daddr), cp->dport, 
+			NIPQUAD(cp->caddr), cp->cport, NIPQUAD(cp->vaddr), cp->vport, NIPQUAD(cp->daddr), cp->dport,
 			cp->protocol, cp->flags, cp->state);
 */
 	if (cp->hw_acc) {
@@ -1941,21 +2135,21 @@ int32 rtl_ip_vs_conn_expire_check(struct ip_vs_conn *cp)
 		rtl865xNaptEntry.remIp=cp->caddr.ip;
 		rtl865xNaptEntry.remPort=cp->cport;
 
-		timeval = rtl865x_naptSync(&rtl865xNaptEntry, 0);
-		
-		if (timeval > 0 && (cp->protocol==IPPROTO_UDP))
+		elapsed = rtl865x_naptSync(&rtl865xNaptEntry, 0);
+
+		if (elapsed >= 0 && (cp->protocol==IPPROTO_UDP))
 		{
-			cp->timer.expires = jiffies + (timeval)*HZ;
+			cp->timer.expires = jiffies + (expires-elapsed)*HZ;
 			add_timer(&cp->timer);
 			#ifdef CONFIG_HARDWARE_NAT_DEBUG
 			/*2007-12-19*/
 			printk("%s:%d:(%s): expired time = %d\n %s (%u.%u.%u.%u:%u -> %u.%u.%u.%u:%u) g:(%u.%u.%u.%u:%u)\n",
 					__FUNCTION__,__LINE__,"poll_nat", timeval, (cp->protocol==IPPROTO_TCP)? "tcp": "udp",
-					NIPQUAD(cp->daddr), cp->dport, NIPQUAD(cp->caddr), cp->cport, 
+					NIPQUAD(cp->daddr), cp->dport, NIPQUAD(cp->caddr), cp->cport,
 					NIPQUAD(cp->vaddr), cp->vport
 			);
 			#endif
-		
+
 			return FAILED;
 		}
 	}
@@ -1980,7 +2174,7 @@ int32 rtl_ip_vs_conn_expire_check_delete(struct ip_vs_conn *cp)
 		rtl865xNaptEntry.remPort=cp->cport;
 
 		rc = rtl865x_delNaptConnection(&rtl865xNaptEntry);
-		
+
 		#ifdef CONFIG_HARDWARE_NAT_DEBUG
 		/*2007-12-19*/
 		printk("%s:%d:(%s): errno=%d\n %s (%u.%u.%u.%u:%u -> %u.%u.%u.%u:%u) g:(%u.%u.%u.%u:%u)\n",
@@ -2010,15 +2204,15 @@ int32 rtl_tcp_state_transition_check(struct ip_vs_conn *cp, int direction, const
 	/*2007-12-19*/
 	/*
 	printk("ip_vs_set_state: c:(%u.%u.%u.%u:%d), v:(%u.%u.%u.%u:%d), \n\td:(%u.%u.%u.%u:%d), p:(%x), f: %x, s: %x, master: %s\n\tapp_data: %x, app: %x\n",
-		NIPQUAD(cp->caddr), cp->cport, NIPQUAD(cp->vaddr), cp->vport, NIPQUAD(cp->daddr), cp->dport, cp->protocol, cp->flags, cp->state, 
+		NIPQUAD(cp->caddr), cp->cport, NIPQUAD(cp->vaddr), cp->vport, NIPQUAD(cp->daddr), cp->dport, cp->protocol, cp->flags, cp->state,
 		cp->control? "yes": "no", cp->app_data, cp->app);
 	*/
 	#if 0
 	if (!cp->hw_acc && !cp->app &&
-		cp->state==IP_VS_S_ESTABLISHED) 
+		cp->state==IP_VS_S_ESTABLISHED)
 	#else
 	if (!cp->hw_acc && !cp->app &&
-		cp->state==IP_VS_TCP_S_ESTABLISHED) 
+		cp->state==IP_VS_TCP_S_ESTABLISHED)
 	#endif
 	{
 		int rc;
@@ -2038,7 +2232,7 @@ int32 rtl_tcp_state_transition_check(struct ip_vs_conn *cp, int direction, const
 			rtl865xQosMark.downlinkMark=0;	//Initial
 			rtl865xQosMark.uplinkMark=0;	//Initial
 			ret=rtl_qosGetSkbMarkByNaptEntry(&rtl865xNaptEntry, &rtl865xQosMark, skb);
-		
+
 			lanDev=rtl865x_getLanDev();
 			wanDev=rtl865x_getWanDev();
 			rtl865xPrio.downlinkPrio=rtl_qosGetPriorityByMark(lanDev->name, rtl865xQosMark.downlinkMark);
@@ -2055,7 +2249,7 @@ int32 rtl_tcp_state_transition_check(struct ip_vs_conn *cp, int direction, const
 			rtl865xPrio.downlinkPrio=0;
 			rtl865xPrio.uplinkPrio=0;
 		}
-		
+
 		#if defined(CONFIG_RTL_LAYERED_DRIVER_L4)
 		rtl865xNaptEntry.protocol=RTL865X_PROTOCOL_TCP;
 		rtl865xNaptEntry.intIp=cp->daddr.ip;
@@ -2091,7 +2285,7 @@ int32 rtl_udp_state_transition_check(struct ip_vs_conn *cp, int direction, const
 	#endif
 
 	/*2007-12-19*/
-	if (!cp->hw_acc && !cp->app) 
+	if (!cp->hw_acc && !cp->app)
 	{
 		int rc;
 		rc = 0;
@@ -2109,7 +2303,7 @@ int32 rtl_udp_state_transition_check(struct ip_vs_conn *cp, int direction, const
 			rtl865xQosMark.downlinkMark=0;	//Initial
 			rtl865xQosMark.uplinkMark=0;	//Initial
 			ret=rtl_qosGetSkbMarkByNaptEntry(&rtl865xNaptEntry, &rtl865xQosMark, skb);
-			
+
 			lanDev=rtl865x_getLanDev();
 			wanDev=rtl865x_getWanDev();
 			rtl865xPrio.downlinkPrio=rtl_qosGetPriorityByMark(lanDev->name, rtl865xQosMark.downlinkMark);
@@ -2126,7 +2320,7 @@ int32 rtl_udp_state_transition_check(struct ip_vs_conn *cp, int direction, const
 			rtl865xPrio.downlinkPrio=0;
 			rtl865xPrio.uplinkPrio=0;
 		}
-		
+
 		#if defined(CONFIG_RTL_LAYERED_DRIVER_L4)
 		rtl865xNaptEntry.protocol=RTL865X_PROTOCOL_UDP;
 		rtl865xNaptEntry.intIp=cp->daddr.ip;
@@ -2150,7 +2344,7 @@ int32 rtl_udp_state_transition_check(struct ip_vs_conn *cp, int direction, const
 	}
 }
 
-#endif 
+#endif
 
 #if defined(CONFIG_PROC_FS) && defined(CONFIG_RTL_NF_CONNTRACK_GARBAGE_NEW)
 static struct proc_dir_entry *proc_gc_overflow_timout=NULL;
@@ -2173,14 +2367,14 @@ static int gc_overflow_timout_write_proc(struct file *file, const char *buffer,
 		      unsigned long count, void *data)
 {
 	uint32 tmpBuf[32];
-	
-      if (count < 2) 
+
+      if (count < 2)
 	    return -EFAULT;
 
       if (buffer && !copy_from_user(tmpBuf, buffer, count)) {
 	    tmpBuf[count-1]=0;
 	    rtl_gc_overflow_timout=simple_strtol((const char *)tmpBuf, NULL, 0);
-	
+
 	    return count;
       }
       return -EFAULT;
@@ -2196,4 +2390,315 @@ void gc_overflow_timout_proc_init(void)
 }
 #endif
 
+#if defined(CONFIG_RTL_LOG_DEBUG)
+struct RTL_LOG_PRINT_MASK
+/*{
+	uint32 ERROR:1;
+	uint32 WARN:1;
+	uint32 INFO:1;
+}*/ RTL_LogTypeMask;
+struct RTL_LOG_ERROR_MASK
+/*{
+	uint32 MEM:1;
+	uint32 SKB:1;
+}*/RTL_LogErrorMask;
+struct RTL_LOG_MODULE_MASK
+/*{
+	uint8 NIC:1;
+	uint8 WIRELESS:1;
+	uint8 PROSTACK:1;
+}*/RTL_LogModuleMask;
+uint32 RTL_LogRatelimit=1;
+
+static struct proc_dir_entry *proc_log_print_control=NULL;
+static struct proc_dir_entry *proc_printMask=NULL;
+static struct proc_dir_entry *proc_errMask=NULL;
+static struct proc_dir_entry *proc_printModule=NULL;
+static struct proc_dir_entry *proc_print_rateLimit=NULL;
+const char *print_Mask_ID="typeMask";
+const char *print_errMask_ID="errMask";
+const char *print_rateLimit_ID="rateLimit_enable";
+const char *print_module_ID="module_mask";
+
+static int print_log_read_proc(char *page, char **start, off_t off,
+		     int count, int *eof, void *data)
+{
+	int len;
+
+	if(0==strcmp(data, print_Mask_ID))
+	{
+		len = sprintf(page, "RTL_LogTypeMask(0x%x)\n\tbit means:\n\t ERROR %d\n\t WARN %d \n\t INFO %d \n", \
+						*(uint32 *)&RTL_LogTypeMask, RTL_LogTypeMask.ERROR, RTL_LogTypeMask.WARN, RTL_LogTypeMask.INFO);
+	}
+	else if(0==strcmp(data, print_errMask_ID))
+	{
+		len = sprintf(page, "RTL_LogErrorMask(0x%x)\n\tbit means:\n\t MEM %d\n\t SKB %d \n", \
+						*(uint32 *)&RTL_LogErrorMask, RTL_LogErrorMask.MEM, RTL_LogErrorMask.SKB);
+	}
+	else if(0==strcmp(data, print_rateLimit_ID))
+	{
+		len = sprintf(page, "rate_limit %d \n", RTL_LogRatelimit);
+	}
+	else if(0==strcmp(data, print_module_ID))
+	{
+		len = sprintf(page, "RTL_LogModuleMask(0x%x)\n\tbit means:\n\t NIC %d\n\t WIRELESS %d \n\t PROSTACK %d \n", \
+			  *(uint32 *)&RTL_LogModuleMask, RTL_LogModuleMask.NIC, RTL_LogModuleMask.WIRELESS, RTL_LogModuleMask.PROSTACK);
+	}
+
+	if (len <= off+count) *eof = 1;
+	*start = page + off;
+	len -= off;
+	if (len>count) len = count;
+	if (len<0) len = 0;
+	return len;
+}
+
+static int print_log_write_proc(struct file *file, const char *buffer,
+		      unsigned long count, void *data)
+{
+	unsigned char tmpBuf[32];
+	int tmp;
+	if (count < 2)
+		return -EFAULT;
+
+	if (!buffer || copy_from_user(tmpBuf, buffer, count)) {
+		return -EFAULT;
+	}
+
+	if(0==strcmp(data, print_Mask_ID))
+	{
+		sscanf(tmpBuf, "%x", &tmp);
+		*(uint32 *)&RTL_LogTypeMask=tmp;
+	}
+	else if(0==strcmp(data, print_errMask_ID))
+	{
+		sscanf(tmpBuf, "%x", &tmp);
+		*(uint32 *)&RTL_LogErrorMask=tmp;
+	}
+	else if(0==strcmp(data, print_rateLimit_ID))
+	{
+		tmpBuf[count-1]=0;
+		RTL_LogRatelimit=simple_strtol((const char *)tmpBuf, NULL, 0);
+	}
+	else if(0==strcmp(data, print_module_ID))
+	{
+		sscanf(tmpBuf, "%x", &tmp);
+		*(uint32 *)&RTL_LogModuleMask=tmp;
+	}
+
+	return count;
+}
+void log_print_proc_init(void)
+{
+	RTL_LogTypeMask.ERROR=1;
+		RTL_LogErrorMask.MEM=1;
+		RTL_LogErrorMask.SKB=1;
+
+	RTL_LogTypeMask.WARN=1;
+	RTL_LogTypeMask.INFO=0;
+
+	RTL_LogModuleMask.NIC=1;
+	RTL_LogModuleMask.WIRELESS=1;
+	RTL_LogModuleMask.PROSTACK=1;
+
+	RTL_LogRatelimit=1;
+
+	proc_log_print_control= proc_mkdir("log_print_control",NULL);
+	if(proc_log_print_control)
+	{
+
+		proc_printMask = create_proc_entry(print_Mask_ID, 0, proc_log_print_control);
+		if (proc_printMask) {
+			proc_printMask->read_proc = print_log_read_proc;
+			proc_printMask->write_proc = print_log_write_proc;
+			proc_printMask->data = (void *)print_Mask_ID;
+		}
+
+		proc_errMask = create_proc_entry(print_errMask_ID, 0, proc_log_print_control);
+		if (proc_errMask) {
+			proc_errMask->read_proc = print_log_read_proc;
+			proc_errMask->write_proc = print_log_write_proc;
+			proc_errMask->data = (void *)print_errMask_ID;
+		}
+
+		proc_print_rateLimit = create_proc_entry(print_rateLimit_ID, 0, proc_log_print_control);
+		if (proc_print_rateLimit) {
+			proc_print_rateLimit->read_proc = print_log_read_proc;
+			proc_print_rateLimit->write_proc = print_log_write_proc;
+			proc_print_rateLimit->data = (void *)print_rateLimit_ID;
+		}
+
+		proc_printModule = create_proc_entry(print_module_ID, 0, proc_log_print_control);
+		if (proc_printModule) {
+			proc_printModule->read_proc = print_log_read_proc;
+			proc_printModule->write_proc = print_log_write_proc;
+			proc_printModule->data = (void *)print_module_ID;
+		}
+	}
+}
+#endif
+
+#if defined(CONFIG_RTL_NF_CONNTRACK_GARBAGE_NEW) //CONFIG_RTL_GC_INDEPENDENCE_ON_KERNEL
+int rtl_gc_threshold_check(struct net* net)
+{
+	int ret = FAILED;
+
+	if(net == NULL){
+		if(atomic_read(&(init_net.ct.count)) > rtl_nf_conntrack_threshold)
+			ret = SUCCESS;
+	}else{
+		if(atomic_read(&net->ct.count) > rtl_nf_conntrack_threshold)
+			ret = SUCCESS;
+	}
+
+	return ret;
+}
+
+void rtl_list_del(struct nf_conn* ct)
+{
+	return	list_del(&ct->state_tuple);
+}
+
+void rtl_hlist_nulls_del_rcu(struct nf_conn* ct, enum ip_conntrack_dir dir)
+{
+	return	hlist_nulls_del_rcu(&ct->tuplehash[dir].hnnode);
+}
+
+void rtl_list_add_tail(struct nf_conn* ct, int proto, int flag)
+{
+	if(proto == PROT_UDP)
+		return list_add_tail(&ct->state_tuple,Udp_State_Hash_Head[flag].state_hash);
+	else if(proto == PROT_TCP)
+		return list_add_tail(&ct->state_tuple,Tcp_State_Hash_Head[ct->proto.tcp.state].state_hash);
+}
+
+
+int rtl_test_bit(struct nf_conn* ct, int num)
+{
+	if(test_bit(num, &ct->status))
+		return SUCCESS;
+	else
+		return FAILED;
+}
+
+int rtl_del_ct_timer(struct nf_conn *ct)
+{
+	return del_timer(&ct->timeout);
+}
+
+void rtl_add_ct_timer(struct nf_conn *ct)
+{
+	return add_timer(&ct->timeout);
+}
+
+void rtl_list_move_tail(struct nf_conn *ct, int proto, int state)
+{
+	if(proto == PROT_UDP)
+		return list_move_tail(&ct->state_tuple, Udp_State_Hash_Head[state].state_hash);
+	else if(proto == PROT_TCP)
+		return list_move_tail(&ct->state_tuple, Tcp_State_Hash_Head[(enum tcp_conntrack)state].state_hash);
+}
+
+unsigned long rtl_get_ct_timer_expires(struct nf_conn* ct)
+{
+	return ct->timeout.expires;
+}
+
+void rtl_nf_ct_stat_inc(struct net* net)
+{
+	NF_CT_STAT_INC(net, delete_list);
+
+	return;
+}
+
+int rtl_skb_network_offset(struct sk_buff *skb)
+{
+	return skb_network_offset(skb);
+}
+
+u_int8_t rtl_new_gc_get_ct_protonum(void *ct_ptr, enum ip_conntrack_dir dir)
+{
+	struct nf_conn *ct = (struct nf_conn *)ct_ptr;
+
+	return ct->tuplehash[dir].tuple.dst.protonum;
+}
+
+struct iphdr *rtl_new_gc_ip_hdr(struct sk_buff *skb)
+{
+	return ip_hdr(skb);
+}
+
+__be16 rtl_new_gc_get_skb_protocol(struct sk_buff *skb)
+{
+	return skb->protocol;
+}
+
+unsigned long rtl_new_gc_get_ct_udp_status(void *ct_ptr)
+{
+	struct nf_conn *ct = (struct nf_conn *)ct_ptr;
+
+	return ct->status;
+}
+
+u_int8_t rtl_new_gc_get_ct_tcp_state(void *ct_ptr)
+{
+	struct nf_conn *ct = (struct nf_conn *)ct_ptr;
+
+	return ct->proto.tcp.state;
+}
+
+void rtl_new_gc_set_ct_timeout_expires(void *ct_ptr, unsigned long value)
+{
+	struct nf_conn *ct = (struct nf_conn *)ct_ptr;
+
+	ct->timeout.expires = value;
+
+	return;
+}
+
+/*flag = 0 for src; flag = 1 for dst*/
+__be32 rtl_new_gc_get_ct_ip_by_dir(void *ct_ptr, enum ip_conntrack_dir dir, int flag)
+{
+	struct nf_conn *ct = (struct nf_conn *)ct_ptr;
+
+	if(dir == IP_CT_DIR_ORIGINAL)
+	{
+		if(flag == 0)
+			return ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
+		else if(flag == 1)
+			return ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip;
+	}
+	else if(dir == IP_CT_DIR_REPLY)
+	{
+		if(flag == 0)
+			return ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip;
+		else if(flag == 1)
+			return ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
+	}
+}
+
+/*flag = 0 for src; flag = 1 for dst*/
+__be16 rtl_new_gc_get_ct_port_by_dir(void *ct_ptr, enum ip_conntrack_dir dir, int flag)
+{
+	struct nf_conn *ct = (struct nf_conn *)ct_ptr;
+
+	if(dir == IP_CT_DIR_ORIGINAL)
+	{
+		if(flag == 0)
+			return ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u.all;
+		else if(flag == 1)
+			return ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u.all;
+
+	}
+	else if(dir == IP_CT_DIR_REPLY)
+	{
+		if(flag == 0)
+			return ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u.all;
+		else if(flag == 1)
+			return ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u.all;
+	}
+}
+
+#endif
+