netfilter: x_tables: use NFPROTO_* in extensions

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

diff --git a/net/netfilter/xt_tcpmss.c b/net/netfilter/xt_tcpmss.c
index d7a5b27fe81eae02b52bc122617b03c9e3d9d0e7..4791c7cbe5a9eadd750e142f9d6d822925534423 100644 (file)
--- a/net/netfilter/xt_tcpmss.c
+++ b/net/netfilter/xt_tcpmss.c
@@ -31,9 +31,11 @@ tcpmss_mt(const struct sk_buff *skb, const struct net_device *in,
           bool *hotdrop)
 {
        const struct xt_tcpmss_match_info *info = matchinfo;
-       struct tcphdr _tcph, *th;
+       const struct tcphdr *th;
+       struct tcphdr _tcph;
        /* tcp.doff is only 4 bits, ie. max 15 * 4 bytes */
-       u8 _opt[15 * 4 - sizeof(_tcph)], *op;
+       const u_int8_t *op;
+       u8 _opt[15 * 4 - sizeof(_tcph)];
        unsigned int i, optlen;
 
        /* If we don't have the whole header, drop packet. */
@@ -81,7 +83,7 @@ dropit:
 static struct xt_match tcpmss_mt_reg[] __read_mostly = {
        {
                .name           = "tcpmss",
-               .family         = AF_INET,
+               .family         = NFPROTO_IPV4,
                .match          = tcpmss_mt,
                .matchsize      = sizeof(struct xt_tcpmss_match_info),
                .proto          = IPPROTO_TCP,
@@ -89,7 +91,7 @@ static struct xt_match tcpmss_mt_reg[] __read_mostly = {
        },
        {
                .name           = "tcpmss",
-               .family         = AF_INET6,
+               .family         = NFPROTO_IPV6,
                .match          = tcpmss_mt,
                .matchsize      = sizeof(struct xt_tcpmss_match_info),
                .proto          = IPPROTO_TCP,