diff options
| author | Simon Horman <horms@verge.net.au> | 2008-10-07 08:40:11 +1100 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2008-10-07 08:40:11 +1100 |
| commit | a5e8546a8bff5d2047adc279df5753c44ba7b1a1 (patch) | |
| tree | d9ca91f74d8279adbb1d3e942cc7ab145780ee29 /net/netfilter | |
| parent | cb7f6a7b716e801097b564dec3ccb58d330aef56 (diff) | |
| parent | c7004482e8dcb7c3c72666395cfa98a216a4fb70 (diff) | |
| download | kernel_samsung_crespo-a5e8546a8bff5d2047adc279df5753c44ba7b1a1.zip kernel_samsung_crespo-a5e8546a8bff5d2047adc279df5753c44ba7b1a1.tar.gz kernel_samsung_crespo-a5e8546a8bff5d2047adc279df5753c44ba7b1a1.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into lvs-next-2.6
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/xt_time.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/netfilter/xt_time.c b/net/netfilter/xt_time.c index 9f32859..307a2c3 100644 --- a/net/netfilter/xt_time.c +++ b/net/netfilter/xt_time.c @@ -136,17 +136,19 @@ static void localtime_3(struct xtm *r, time_t time) * from w repeatedly while counting.) */ if (is_leap(year)) { + /* use days_since_leapyear[] in a leap year */ for (i = ARRAY_SIZE(days_since_leapyear) - 1; - i > 0 && days_since_year[i] > w; --i) + i > 0 && days_since_leapyear[i] > w; --i) /* just loop */; + r->monthday = w - days_since_leapyear[i] + 1; } else { for (i = ARRAY_SIZE(days_since_year) - 1; i > 0 && days_since_year[i] > w; --i) /* just loop */; + r->monthday = w - days_since_year[i] + 1; } r->month = i + 1; - r->monthday = w - days_since_year[i] + 1; return; } |