Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / net / ipv6 / netfilter / ip6table_mangle.c

diff --git a/net/ipv6/netfilter/ip6table_mangle.c b/net/ipv6/netfilter/ip6table_mangle.c
index d0b31b259d4d0c69a07b125c0dc356a78038b5aa..ab0d398a2ba7060c277364313bd9690fffddca48 100644 (file)
--- a/net/ipv6/netfilter/ip6table_mangle.c
+++ b/net/ipv6/netfilter/ip6table_mangle.c
@@ -60,7 +60,6 @@ static struct
 static struct xt_table packet_mangler = {
        .name           = "mangle",
        .valid_hooks    = MANGLE_VALID_HOOKS,
-       .lock           = __RW_LOCK_UNLOCKED(packet_mangler.lock),
        .me             = THIS_MODULE,
        .af             = AF_INET6,
 };