diff --git a/[refs] b/[refs] index d896f07a4ad6..eae98281f85e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd7fcbf1cb6933bfb9171452b4a370c92923544d +refs/heads/master: e6210f3be5b13b6cda9c8dad8926818a73c8e6ac diff --git a/trunk/net/netfilter/xt_time.c b/trunk/net/netfilter/xt_time.c index 29375ba8db73..93acaa59d108 100644 --- a/trunk/net/netfilter/xt_time.c +++ b/trunk/net/netfilter/xt_time.c @@ -243,6 +243,17 @@ static struct xt_match xt_time_mt_reg __read_mostly = { static int __init time_mt_init(void) { + int minutes = sys_tz.tz_minuteswest; + + if (minutes < 0) /* east of Greenwich */ + printk(KERN_INFO KBUILD_MODNAME + ": kernel timezone is +%02d%02d\n", + -minutes / 60, -minutes % 60); + else /* west of Greenwich */ + printk(KERN_INFO KBUILD_MODNAME + ": kernel timezone is -%02d%02d\n", + minutes / 60, minutes % 60); + return xt_register_match(&xt_time_mt_reg); }