diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-24 13:24:36 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-24 13:24:36 -0700 |
| commit | b5bb14386eabcb4229ade2bc0a2b237ca166d37d (patch) | |
| tree | 1966e65479f0d12cec0a204443a95b8eb57946db /net/netfilter/xt_hashlimit.c | |
| parent | bb4f92b3a33bfc31f55098da85be44702bea2d16 (diff) | |
| parent | 1d45209d89e647e9f27e4afa1f47338df73bc112 (diff) | |
| download | kernel_samsung_smdk4412-b5bb14386eabcb4229ade2bc0a2b237ca166d37d.zip kernel_samsung_smdk4412-b5bb14386eabcb4229ade2bc0a2b237ca166d37d.tar.gz kernel_samsung_smdk4412-b5bb14386eabcb4229ade2bc0a2b237ca166d37d.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/netfilter/xt_hashlimit.c')
| -rw-r--r-- | net/netfilter/xt_hashlimit.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c index f97fded..a5b5369 100644 --- a/net/netfilter/xt_hashlimit.c +++ b/net/netfilter/xt_hashlimit.c @@ -149,7 +149,7 @@ dsthash_alloc_init(struct xt_hashlimit_htable *ht, /* initialize hash with random val at the time we allocate * the first hashtable entry */ if (!ht->rnd_initialized) { - get_random_bytes(&ht->rnd, 4); + get_random_bytes(&ht->rnd, sizeof(ht->rnd)); ht->rnd_initialized = 1; } @@ -565,8 +565,7 @@ hashlimit_init_dst(const struct xt_hashlimit_htable *hinfo, static bool hashlimit_mt_v0(const struct sk_buff *skb, const struct xt_match_param *par) { - const struct xt_hashlimit_info *r = - ((const struct xt_hashlimit_info *)par->matchinfo)->u.master; + const struct xt_hashlimit_info *r = par->matchinfo; struct xt_hashlimit_htable *hinfo = r->hinfo; unsigned long now = jiffies; struct dsthash_ent *dh; @@ -702,8 +701,6 @@ static bool hashlimit_mt_check_v0(const struct xt_mtchk_param *par) } mutex_unlock(&hlimit_mutex); - /* Ugly hack: For SMP, we only want to use one set */ - r->u.master = r; return true; } |