Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6

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

diff --git a/net/netfilter/xt_length.c b/net/netfilter/xt_length.c
index 67fd30d9f303232bfd64bfda54c0e7746b2adc47..32fb998d9bac6e49f2d237afc3d10291f38c2224 100644 (file)
--- a/net/netfilter/xt_length.c
+++ b/net/netfilter/xt_length.c
@@ -32,7 +32,7 @@ match(const struct sk_buff *skb,
 {
        const struct xt_length_info *info = matchinfo;
        u_int16_t pktlen = ntohs(skb->nh.iph->tot_len);
-       
+
        return (pktlen >= info->min && pktlen <= info->max) ^ info->invert;
 }
 
@@ -48,7 +48,7 @@ match6(const struct sk_buff *skb,
 {
        const struct xt_length_info *info = matchinfo;
        u_int16_t pktlen = ntohs(skb->nh.ipv6h->payload_len) + sizeof(struct ipv6hdr);
-       
+
        return (pktlen >= info->min && pktlen <= info->max) ^ info->invert;
 }