From: Patrick McHardy <kaber@trash.net>
To: "David S. Miller" <davem@davemloft.net>
Cc: Netfilter Development Mailinglist <netfilter-devel@lists.netfilter.org>
Subject: [PATCH 2.6 6/9]: Enable rx timestamps in ip_queue/ip6_queue
Date: Mon, 15 Nov 2004 22:45:01 +0100 [thread overview]
Message-ID: <4199235D.8030200@trash.net> (raw)
[-- 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);
reply other threads:[~2004-11-15 21:45 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4199235D.8030200@trash.net \
--to=kaber@trash.net \
--cc=davem@davemloft.net \
--cc=netfilter-devel@lists.netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.