Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / net / ipv4 / netfilter / arptable_filter.c

diff --git a/net/ipv4/netfilter/arptable_filter.c b/net/ipv4/netfilter/arptable_filter.c
index e091187e864fe95ac03437bc73cd0713f2d93a01..6ecfdae7c5895f4213004162ae008dea96308e52 100644 (file)
--- a/net/ipv4/netfilter/arptable_filter.c
+++ b/net/ipv4/netfilter/arptable_filter.c
@@ -48,8 +48,6 @@ static struct
 static struct xt_table packet_filter = {
        .name           = "filter",
        .valid_hooks    = FILTER_VALID_HOOKS,
-       .lock           = __RW_LOCK_UNLOCKED(packet_filter.lock),
-       .private        = NULL,
        .me             = THIS_MODULE,
        .af             = NFPROTO_ARP,
 };