netfilter: x_tables: use NFPROTO_* in extensions

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

diff --git a/net/netfilter/xt_esp.c b/net/netfilter/xt_esp.c
index 71c7c378526697da8ec274253e72a45e0acceb13..045c4deecafc5c6a7ae311f8f87a2177fe55d237 100644 (file)
--- a/net/netfilter/xt_esp.c
+++ b/net/netfilter/xt_esp.c
@@ -47,7 +47,8 @@ esp_mt(const struct sk_buff *skb, const struct net_device *in,
        const struct net_device *out, const struct xt_match *match,
        const void *matchinfo, int offset, unsigned int protoff, bool *hotdrop)
 {
-       struct ip_esp_hdr _esp, *eh;
+       const struct ip_esp_hdr *eh;
+       struct ip_esp_hdr _esp;
        const struct xt_esp *espinfo = matchinfo;
 
        /* Must not be a fragment. */
@@ -87,7 +88,7 @@ esp_mt_check(const char *tablename, const void *ip_void,
 static struct xt_match esp_mt_reg[] __read_mostly = {
        {
                .name           = "esp",
-               .family         = AF_INET,
+               .family         = NFPROTO_IPV4,
                .checkentry     = esp_mt_check,
                .match          = esp_mt,
                .matchsize      = sizeof(struct xt_esp),
@@ -96,7 +97,7 @@ static struct xt_match esp_mt_reg[] __read_mostly = {
        },
        {
                .name           = "esp",
-               .family         = AF_INET6,
+               .family         = NFPROTO_IPV6,
                .checkentry     = esp_mt_check,
                .match          = esp_mt,
                .matchsize      = sizeof(struct xt_esp),