[netfilter-cvslog] r4076 - trunk/patch-o-matic-ng/patchlets/connbytes/linux-2.6/net/ipv4/netfilter

laforge at netfilter.org laforge at netfilter.org
Tue Jun 28 14:22:10 CEST 2005


Author: laforge at netfilter.org
Date: 2005-06-28 14:22:10 +0200 (Tue, 28 Jun 2005)
New Revision: 4076

Modified:
   trunk/patch-o-matic-ng/patchlets/connbytes/linux-2.6/net/ipv4/netfilter/ipt_connbytes.c
Log:
use do_div() correctly


Modified: trunk/patch-o-matic-ng/patchlets/connbytes/linux-2.6/net/ipv4/netfilter/ipt_connbytes.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/connbytes/linux-2.6/net/ipv4/netfilter/ipt_connbytes.c	2005-06-28 12:01:44 UTC (rev 4075)
+++ trunk/patch-o-matic-ng/patchlets/connbytes/linux-2.6/net/ipv4/netfilter/ipt_connbytes.c	2005-06-28 12:22:10 UTC (rev 4076)
@@ -76,7 +76,8 @@
 					pkts32 = 0xffffffff;
 				else
 					pkts32 = ct->counters[IP_CT_DIR_ORIGINAL].packets;
-				what = do_div(ct->counters[IP_CT_DIR_ORIGINAL].bytes, pkts32);
+				what = ct->counters[IP_CT_DIR_ORIGINAL].bytes;
+				do_div(what, pkts32);
 			}
 			break;
 		case IPT_CONNBYTES_DIR_REPLY:
@@ -88,7 +89,9 @@
 					pkts32 = 0xffffffff;
 				else
 					pkts32 = ct->counters[IP_CT_DIR_REPLY].packets;
-				what = do_div(ct->counters[IP_CT_DIR_REPLY].bytes, pkts32);
+
+				what = ct->counters[IP_CT_DIR_REPLY].bytes;
+				do_div(what, pkts32);
 			}
 			break;
 		case IPT_CONNBYTES_DIR_BOTH:
@@ -105,7 +108,8 @@
 				else
 					pkts32 = pkts;
 
-				what = do_div(bytes, pkts32);
+				what = bytes;
+				do_div(what, pkts32);
 			}
 			break;
 		}




More information about the netfilter-cvslog mailing list