[PATCH 2.6.22.3 5/5] nfnetlink_log: Fix some constants

[PATCH 2.6.22.3 5/5] nfnetlink_log: Fix some constants

[Michał Mirosław]

Fix timeout (one second is 1 * HZ) and convert max packet copy length
to #defined constant.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>                                                               

--- lq4/net/netfilter/nfnetlink_log.c	2007-09-21 18:42:09.000000000 +0200
+++ rechot/net/netfilter/nfnetlink_log.c	2007-09-21 18:41:42.000000000 +0200
@@ -37,8 +37,9 @@
 #endif
 
 #define NFULNL_NLBUFSIZ_DEFAULT	NLMSG_GOODSIZE
-#define NFULNL_TIMEOUT_DEFAULT 	100	/* every second */
+#define NFULNL_TIMEOUT_DEFAULT 	HZ	/* every second */
 #define NFULNL_QTHRESH_DEFAULT 	100	/* 100 packets */
+#define NFULNL_COPY_RANGE_MAX	0xFFFF	/* max packet size is limited by 16-bit struct nfattr nfa_len field */
 
 #define PRINTR(x, args...)	do { if (net_ratelimit()) \
 				     printk(x, ## args); } while (0);
@@ -172,7 +173,7 @@
 	inst->flushtimeout 	= NFULNL_TIMEOUT_DEFAULT;
 	inst->nlbufsiz 		= NFULNL_NLBUFSIZ_DEFAULT;
 	inst->copy_mode 	= NFULNL_COPY_PACKET;
-	inst->copy_range 	= 0xffff;
+	inst->copy_range 	= NFULNL_COPY_RANGE_MAX;
 
 	hlist_add_head(&inst->hlist,
 		       &instance_table[instance_hashfn(group_num)]);
@@ -236,11 +237,7 @@
 
 	case NFULNL_COPY_PACKET:
 		inst->copy_mode = mode;
-		/* we're using struct nfattr which has 16bit nfa_len */
-		if (range > 0xffff)
-			inst->copy_range = 0xffff;
-		else
-			inst->copy_range = range;
+		inst->copy_range = min(range, NFULNL_COPY_RANGE_MAX);
 		break;
 
 	default:
-
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 2.6.22.3 5/5] nfnetlink_log: Fix some constants

[Patrick McHardy]

Micha³ Miros³aw wrote:
> Fix timeout (one second is 1 * HZ) and convert max packet copy length
> to #defined constant.


Another new warning:

net/netfilter/nfnetlink_log.c: In function 'nfulnl_set_mode':
net/netfilter/nfnetlink_log.c:240: warning: comparison of distinct
pointer types lacks a cast

I also fixed this, but next time I might not apply something like this.
Well, thanks anyway.

-
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html