Merge git://git.infradead.org/battery-2.6

[linux-2.6] / net / ipv4 / netfilter / arpt_mangle.c

diff --git a/net/ipv4/netfilter/arpt_mangle.c b/net/ipv4/netfilter/arpt_mangle.c
index 709db4d3f48f7fe9d7fb3f17a844595e9a690bde..c4bdab47597f071c35cb73f45570552777c8ad48 100644 (file)
--- a/net/ipv4/netfilter/arpt_mangle.c
+++ b/net/ipv4/netfilter/arpt_mangle.c
@@ -30,42 +30,42 @@ target(struct sk_buff **pskb,
                *pskb = nskb;
        }
 
-       arp = (*pskb)->nh.arph;
-       arpptr = (*pskb)->nh.raw + sizeof(*arp);
+       arp = arp_hdr(*pskb);
+       arpptr = skb_network_header(*pskb) + sizeof(*arp);
        pln = arp->ar_pln;
        hln = arp->ar_hln;
        /* We assume that pln and hln were checked in the match */
        if (mangle->flags & ARPT_MANGLE_SDEV) {
                if (ARPT_DEV_ADDR_LEN_MAX < hln ||
-                  (arpptr + hln > (**pskb).tail))
+                  (arpptr + hln > skb_tail_pointer(*pskb)))
                        return NF_DROP;
                memcpy(arpptr, mangle->src_devaddr, hln);
        }
        arpptr += hln;
        if (mangle->flags & ARPT_MANGLE_SIP) {
                if (ARPT_MANGLE_ADDR_LEN_MAX < pln ||
-                  (arpptr + pln > (**pskb).tail))
+                  (arpptr + pln > skb_tail_pointer(*pskb)))
                        return NF_DROP;
                memcpy(arpptr, &mangle->u_s.src_ip, pln);
        }
        arpptr += pln;
        if (mangle->flags & ARPT_MANGLE_TDEV) {
                if (ARPT_DEV_ADDR_LEN_MAX < hln ||
-                  (arpptr + hln > (**pskb).tail))
+                  (arpptr + hln > skb_tail_pointer(*pskb)))
                        return NF_DROP;
                memcpy(arpptr, mangle->tgt_devaddr, hln);
        }
        arpptr += hln;
        if (mangle->flags & ARPT_MANGLE_TIP) {
                if (ARPT_MANGLE_ADDR_LEN_MAX < pln ||
-                  (arpptr + pln > (**pskb).tail))
+                  (arpptr + pln > skb_tail_pointer(*pskb)))
                        return NF_DROP;
                memcpy(arpptr, &mangle->u_t.tgt_ip, pln);
        }
        return mangle->target;
 }
 
-static int
+static bool
 checkentry(const char *tablename, const void *e, const struct xt_target *target,
           void *targinfo, unsigned int hook_mask)
 {
@@ -73,15 +73,15 @@ checkentry(const char *tablename, const void *e, const struct xt_target *target,
 
        if (mangle->flags & ~ARPT_MANGLE_MASK ||
            !(mangle->flags & ARPT_MANGLE_MASK))
-               return 0;
+               return false;
 
        if (mangle->target != NF_DROP && mangle->target != NF_ACCEPT &&
           mangle->target != ARPT_CONTINUE)
-               return 0;
-       return 1;
+               return false;
+       return true;
 }
 
-static struct arpt_target arpt_mangle_reg = {
+static struct arpt_target arpt_mangle_reg __read_mostly = {
        .name           = "mangle",
        .target         = target,
        .targetsize     = sizeof(struct arpt_mangle),