diff options
| author | Patrick McHardy <kaber@coreworks.de> | 2004-11-13 15:29:00 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@coreworks.de> | 2004-11-13 15:29:00 +0100 |
| commit | ee0cbaeff376e2af407475703bbf9a660443dcde (patch) | |
| tree | 24b964c0584517686e18c5f05c9b0e9bcfa42057 | |
| parent | 82347bd71f780f18027fab22c7aa9e3d6ba3cc1b (diff) | |
[NETFILTER]: Enable rx timestamps in ip_queue/ip6_queue
Signed-off-by: Patrick McHardy <kaber@trash.net>
| -rw-r--r-- | net/ipv4/netfilter/ip_queue.c | 6 | ||||
| -rw-r--r-- | net/ipv6/netfilter/ip6_queue.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/net/ipv4/netfilter/ip_queue.c b/net/ipv4/netfilter/ip_queue.c index 7c3c5d1ed43f..d51e2057226f 100644 --- a/net/ipv4/netfilter/ip_queue.c +++ b/net/ipv4/netfilter/ip_queue.c @@ -162,6 +162,7 @@ static inline void __ipq_reset(void) { peer_pid = 0; + net_disable_timestamp(); __ipq_set_mode(IPQ_COPY_NONE, 0); __ipq_flush(NF_DROP); } @@ -517,9 +518,10 @@ ipq_rcv_skb(struct sk_buff *skb) write_unlock_bh(&queue_lock); RCV_SKB_FAIL(-EBUSY); } - } - else + } else { + net_enable_timestamp(); peer_pid = pid; + } write_unlock_bh(&queue_lock); diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c index cf5021816f91..b6cdf6eb3d79 100644 --- a/net/ipv6/netfilter/ip6_queue.c +++ b/net/ipv6/netfilter/ip6_queue.c @@ -167,6 +167,7 @@ static inline void __ipq_reset(void) { peer_pid = 0; + net_disable_timestamp(); __ipq_set_mode(IPQ_COPY_NONE, 0); __ipq_flush(NF_DROP); } @@ -520,9 +521,10 @@ ipq_rcv_skb(struct sk_buff *skb) write_unlock_bh(&queue_lock); RCV_SKB_FAIL(-EBUSY); } - } - else + } else { + net_enable_timestamp(); peer_pid = pid; + } write_unlock_bh(&queue_lock); |