diff options
| author |  Patrick McHardy <kaber@trash.net>
| 2011-01-19 23:51:37 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net>
| 2011-01-19 23:51:37 +0100 |
| commit | 14f0290ba44de6ed435fea24bba26e7868421c66 (patch) | |
| tree | 449d32e4848007e3edbcab14fa8e09fdc66608ed /net/netfilter/x_tables.c | |
| parent | netfilter: nf_conntrack: fix lifetime display for disabled connections (diff) | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne... (diff) | |
| download | linux-14f0290ba44de6ed435fea24bba26e7868421c66.tar.gz linux-14f0290ba44de6ed435fea24bba26e7868421c66.tar.bz2 linux-14f0290ba44de6ed435fea24bba26e7868421c66.zip | |
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 fbc2b72091e0..0a77d2ff2154 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; } |