[IP]: Introduce ip_hdrlen()

[deliverable/linux.git] / net / ipv4 / netfilter / ip_conntrack_ftp.c

diff --git a/net/ipv4/netfilter/ip_conntrack_ftp.c b/net/ipv4/netfilter/ip_conntrack_ftp.c
index 1faa68ab9432e3a830f220ccde7b1348a9762f1d..92389987e78902ba0a01c80bd990283e392e2b2c 100644 (file)
--- a/net/ipv4/netfilter/ip_conntrack_ftp.c
+++ b/net/ipv4/netfilter/ip_conntrack_ftp.c
@@ -319,12 +319,12 @@ static int help(struct sk_buff **pskb,
                return NF_ACCEPT;
        }
 
-       th = skb_header_pointer(*pskb, (*pskb)->nh.iph->ihl*4,
+       th = skb_header_pointer(*pskb, ip_hdrlen(*pskb),
                                sizeof(_tcph), &_tcph);
        if (th == NULL)
                return NF_ACCEPT;
 
-       dataoff = (*pskb)->nh.iph->ihl*4 + th->doff*4;
+       dataoff = ip_hdrlen(*pskb) + th->doff * 4;
        /* No data? */
        if (dataoff >= (*pskb)->len) {
                DEBUGP("ftp: pskblen = %u\n", (*pskb)->len);