Skip to contentSkip to conversation

Trivial replace of ip_queue by nfnetlink_queue in nfnetlink_queue code

PATCH In review Eric Leblond 2 participants 4 messages Aug 12, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Trivial replace of ip_queue by nfnetlink_queue in nfnetlink_queue code

Hi,

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

BR,

---

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

6c270ef9d8727b2b44807b411fb3dd60c87ccf11

net/netfilter/nfnetlink_queue.c +2 -2
index 49ef41e..134219c 100644
@@ -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;
 			}
Signature · 5 lines
1.1.3

-- 
Eric Leblond <[email protected]>
INL
#1 lore raw
Quoted 1 line · Eric Leblond

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.

#2 lore raw
Quoted 4 lines · Patrick McHardy
Quoted 1 line · Eric Leblond

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.

Quoted 2 lines

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

No, I prefer nf_queue.

Quoted 2 lines

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,

Signature · 2 lines
Eric Leblond <[email protected]>
INL
#3 lore raw
Quoted 8 lines · Eric Leblond
Quoted 2 lines · Patrick McHardy

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.

Quoted 2 lines

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.