[PATCH] Trivial replace of ip_queue by nfnetlink_queue in nfnetlink_queue code

[PATCH] Trivial replace of ip_queue by nfnetlink_queue in nfnetlink_queue code

[Eric Leblond]

[-- Attachment #1: Type: text/plain, Size: 1277 bytes --]

Hi,

This patch replace "ip_queue" by "nfnetlink_queue" in nfnetlink_queue.c.

BR,

Signed-off-by: Eric Leblond <eric@inl.fr>


---

 net/netfilter/nfnetlink_queue.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

6c270ef9d8727b2b44807b411fb3dd60c87ccf11
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
index 49ef41e..134219c 100644
--- a/net/netfilter/nfnetlink_queue.c
+++ b/net/netfilter/nfnetlink_queue.c
@@ -584,7 +584,7 @@ nfqnl_enqueue_packet(struct sk_buff *skb
                 queue->queue_dropped++;
 		status = -ENOSPC;
 		if (net_ratelimit())
-		          printk(KERN_WARNING "ip_queue: full at %d entries, "
+		          printk(KERN_WARNING "nfnetlink_queue: full at %d entries, "
 				 "dropping packets(s). Dropped: %d\n", 
 				 queue->queue_total, queue->queue_dropped);
 		goto err_out_free_nskb;
@@ -635,7 +635,7 @@ nfqnl_mangle(void *data, int data_len, s
 			                         diff,
 			                         GFP_ATOMIC);
 			if (newskb == NULL) {
-				printk(KERN_WARNING "ip_queue: OOM "
+				printk(KERN_WARNING "nfnetlink_queue: OOM "
 				      "in mangle, dropping packet\n");
 				return -ENOMEM;
 			}
-- 
1.1.3

-- 
Eric Leblond <eric@inl.fr>
INL

[-- Attachment #2: Ceci est une partie de message numériquement signée --]
[-- Type: application/pgp-signature, Size: 191 bytes --]

Re: [PATCH] Trivial replace of ip_queue by nfnetlink_queue in nfnetlink_queue code

[Patrick McHardy]

Eric Leblond wrote:
> This patch replace "ip_queue" by "nfnetlink_queue" in nfnetlink_queue.c.

I already changed it to nf_queue now. If you want to change it to
nfnetlink_queue, it should be done in all places. But I think it
would make more sense to throw most of these printks out.

Re: [PATCH] Trivial replace of ip_queue by nfnetlink_queue in nfnetlink_queue code

[Eric Leblond]

[-- Attachment #1: Type: text/plain, Size: 751 bytes --]

Le samedi 12 août 2006 à 17:12 +0200, Patrick McHardy a écrit :
> Eric Leblond wrote:
> > This patch replace "ip_queue" by "nfnetlink_queue" in nfnetlink_queue.c.
> 
> I already changed it to nf_queue now.

Oups sorry :-/
I thought you want me to replace nf_queue by nfnetlink_queue in my
previous patch.

>  If you want to change it to
> nfnetlink_queue, it should be done in all places.

No, I prefer nf_queue.

> But I think it
> would make more sense to throw most of these printks out.

The one about queue full is really useful to notice performance issue or
problems.

By the way, do you have a public git tree where we could fetch the
latest version of the code ? 

Best regards,
-- 
Eric Leblond <eric@inl.fr>
INL

[-- Attachment #2: Ceci est une partie de message numériquement signée --]
[-- Type: application/pgp-signature, Size: 191 bytes --]

Re: [PATCH] Trivial replace of ip_queue by nfnetlink_queue in nfnetlink_queue code

[Patrick McHardy]

Eric Leblond wrote:
> Le samedi 12 août 2006 à 17:12 +0200, Patrick McHardy a écrit :
> 
>>But I think it
>>would make more sense to throw most of these printks out.
> 
> 
> The one about queue full is really useful to notice performance issue or
> problems.

Yes, but we already have counters for that and dropped packets are not
too uncommon, we shouldn't flood the ringbuffer with this.

> By the way, do you have a public git tree where we could fetch the
> latest version of the code ? 

No, but it only includes very few patches currently anyway. I plan
to merge the priv_data stuff this weekend and push my queued patches
for 2.6.19 to Dave, so people can work off his tree.