git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://dev.medozas.de/linux
[safe/jmp/linux-2.6]
/
net
/
netfilter
/
xt_time.c
diff --git
a/net/netfilter/xt_time.c
b/net/netfilter/xt_time.c
index
d8556fd
..
79234bb
100644
(file)
--- a/
net/netfilter/xt_time.c
+++ b/
net/netfilter/xt_time.c
@@
-152,7
+152,7
@@
static void localtime_3(struct xtm *r, time_t time)
}
static bool
-time_mt(const struct sk_buff *skb,
const struct xt_match
_param *par)
+time_mt(const struct sk_buff *skb,
struct xt_action
_param *par)
{
const struct xt_time_info *info = par->matchinfo;
unsigned int packet_time;