* [PATCH 2.6 6/9]: Enable rx timestamps in ip_queue/ip6_queue
@ 2004-11-15 21:45 Patrick McHardy
0 siblings, 0 replies; only message in thread
From: Patrick McHardy @ 2004-11-15 21:45 UTC (permalink / raw)
To: David S. Miller; +Cc: Netfilter Development Mailinglist
[-- Attachment #1: Type: text/plain, Size: 46 bytes --]
Enable rx timestamps in ip_queue/ip6_queue.
[-- Attachment #2: 06.diff --]
[-- Type: text/x-patch, Size: 1751 bytes --]
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/11/13 13:29:00+01:00 kaber@coreworks.de
# [NETFILTER]: Enable rx timestamps in ip_queue/ip6_queue
#
# Signed-off-by: Patrick McHardy <kaber@trash.net>
#
# net/ipv6/netfilter/ip6_queue.c
# 2004/11/13 13:28:54+01:00 kaber@coreworks.de +4 -2
# [NETFILTER]: Enable rx timestamps in ip_queue/ip6_queue
#
# Signed-off-by: Patrick McHardy <kaber@trash.net>
#
# net/ipv4/netfilter/ip_queue.c
# 2004/11/13 13:28:54+01:00 kaber@coreworks.de +4 -2
# [NETFILTER]: Enable rx timestamps in ip_queue/ip6_queue
#
# Signed-off-by: Patrick McHardy <kaber@trash.net>
#
diff -Nru a/net/ipv4/netfilter/ip_queue.c b/net/ipv4/netfilter/ip_queue.c
--- a/net/ipv4/netfilter/ip_queue.c 2004-11-15 22:07:17 +01:00
+++ b/net/ipv4/netfilter/ip_queue.c 2004-11-15 22:07:17 +01:00
@@ -162,6 +162,7 @@
__ipq_reset(void)
{
peer_pid = 0;
+ net_disable_timestamp();
__ipq_set_mode(IPQ_COPY_NONE, 0);
__ipq_flush(NF_DROP);
}
@@ -517,9 +518,10 @@
write_unlock_bh(&queue_lock);
RCV_SKB_FAIL(-EBUSY);
}
- }
- else
+ } else {
+ net_enable_timestamp();
peer_pid = pid;
+ }
write_unlock_bh(&queue_lock);
diff -Nru a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c
--- a/net/ipv6/netfilter/ip6_queue.c 2004-11-15 22:07:17 +01:00
+++ b/net/ipv6/netfilter/ip6_queue.c 2004-11-15 22:07:17 +01:00
@@ -167,6 +167,7 @@
__ipq_reset(void)
{
peer_pid = 0;
+ net_disable_timestamp();
__ipq_set_mode(IPQ_COPY_NONE, 0);
__ipq_flush(NF_DROP);
}
@@ -520,9 +521,10 @@
write_unlock_bh(&queue_lock);
RCV_SKB_FAIL(-EBUSY);
}
- }
- else
+ } else {
+ net_enable_timestamp();
peer_pid = pid;
+ }
write_unlock_bh(&queue_lock);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2004-11-15 21:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-11-15 21:45 [PATCH 2.6 6/9]: Enable rx timestamps in ip_queue/ip6_queue Patrick McHardy
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.