diff options
author | Patrick McHardy <kaber@trash.net> | 2011-01-19 22:51:37 (GMT) |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2011-01-19 22:51:37 (GMT) |
commit | 14f0290ba44de6ed435fea24bba26e7868421c66 (patch) | |
tree | 449d32e4848007e3edbcab14fa8e09fdc66608ed /net/netfilter/x_tables.c | |
parent | f5c88f56b35599ab9ff2d3398e0153e4cd4a4c82 (diff) | |
parent | a5db219f4cf9f67995eabd53b81a1232c82f5852 (diff) | |
download | linux-fsl-qoriq-14f0290ba44de6ed435fea24bba26e7868421c66.tar.xz |
Merge branch 'master' of /repos/git/net-next-2.6
Diffstat (limited to 'net/netfilter/x_tables.c')
-rw-r--r-- | net/netfilter/x_tables.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c index fbc2b72..0a77d2f 100644 --- a/net/netfilter/x_tables.c +++ b/net/netfilter/x_tables.c @@ -1355,7 +1355,8 @@ static int __init xt_init(void) for_each_possible_cpu(i) { struct xt_info_lock *lock = &per_cpu(xt_info_locks, i); - spin_lock_init(&lock->lock); + + seqlock_init(&lock->lock); lock->readers = 0; } |