Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[mv-sheeva.git] / net / netfilter / nfnetlink.c

diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
index 92761a9883751ce2f266c5c8881c7074a94a07c0..eedc0c1ac7a4e071f5925a79eabada91d18cd20f 100644 (file)
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@ -170,7 +170,7 @@ replay:
                if (err < 0)
                        return err;
 
-               err = nc->call(nfnl, skb, nlh, cda);
+               err = nc->call(nfnl, skb, nlh, (const struct nlattr **)cda);
                if (err == -EAGAIN)
                        goto replay;
                return err;