diff options
Diffstat (limited to 'net/bridge')
-rw-r--r-- | net/bridge/netfilter/ebt_ulog.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c index 8e15cc47f6c0..259f5c370f3c 100644 --- a/net/bridge/netfilter/ebt_ulog.c +++ b/net/bridge/netfilter/ebt_ulog.c | |||
@@ -130,6 +130,7 @@ static void ebt_ulog_packet(unsigned int hooknr, const struct sk_buff *skb, | |||
130 | unsigned int group = uloginfo->nlgroup; | 130 | unsigned int group = uloginfo->nlgroup; |
131 | ebt_ulog_buff_t *ub = &ulog_buffers[group]; | 131 | ebt_ulog_buff_t *ub = &ulog_buffers[group]; |
132 | spinlock_t *lock = &ub->lock; | 132 | spinlock_t *lock = &ub->lock; |
133 | ktime_t kt; | ||
133 | 134 | ||
134 | if ((uloginfo->cprange == 0) || | 135 | if ((uloginfo->cprange == 0) || |
135 | (uloginfo->cprange > skb->len + ETH_HLEN)) | 136 | (uloginfo->cprange > skb->len + ETH_HLEN)) |
@@ -164,9 +165,10 @@ static void ebt_ulog_packet(unsigned int hooknr, const struct sk_buff *skb, | |||
164 | 165 | ||
165 | /* Fill in the ulog data */ | 166 | /* Fill in the ulog data */ |
166 | pm->version = EBT_ULOG_VERSION; | 167 | pm->version = EBT_ULOG_VERSION; |
167 | do_gettimeofday(&pm->stamp); | 168 | kt = ktime_get_real(); |
169 | pm->stamp = ktime_to_timeval(kt); | ||
168 | if (ub->qlen == 1) | 170 | if (ub->qlen == 1) |
169 | skb_set_timestamp(ub->skb, &pm->stamp); | 171 | ub->skb->tstamp = kt; |
170 | pm->data_len = copy_len; | 172 | pm->data_len = copy_len; |
171 | pm->mark = skb->mark; | 173 | pm->mark = skb->mark; |
172 | pm->hook = hooknr; | 174 | pm->hook = hooknr; |