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/bridge/netfilter/ebtable_nat.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/bridge/netfilter/ebtable_nat.c')
| -rw-r--r-- | net/bridge/netfilter/ebtable_nat.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/bridge/netfilter/ebtable_nat.c b/net/bridge/netfilter/ebtable_nat.c index 3fe1ae8..6024c55 100644 --- a/net/bridge/netfilter/ebtable_nat.c +++ b/net/bridge/netfilter/ebtable_nat.c @@ -55,7 +55,6 @@ static struct ebt_table frame_nat = .name = "nat", .table = &initial_table, .valid_hooks = NAT_VALID_HOOKS, - .lock = __RW_LOCK_UNLOCKED(frame_nat.lock), .check = check, .me = THIS_MODULE, }; |