[IP]: Introduce ip_hdrlen()

[mirror_ubuntu-artful-kernel.git] / net / ipv4 / netfilter / ip_conntrack_sip.c

diff --git a/net/ipv4/netfilter/ip_conntrack_sip.c b/net/ipv4/netfilter/ip_conntrack_sip.c
index c59a962c1f61c2c415b2e6ff7b12de755fa72864..7363e2a5cea4e4b7fa31ecbda00f45740a2d1c1f 100644 (file)
--- a/net/ipv4/netfilter/ip_conntrack_sip.c
+++ b/net/ipv4/netfilter/ip_conntrack_sip.c
@@ -402,7 +402,7 @@ static int sip_help(struct sk_buff **pskb,
        typeof(ip_nat_sip_hook) ip_nat_sip;
 
        /* No Data ? */
-       dataoff = (*pskb)->nh.iph->ihl*4 + sizeof(struct udphdr);
+       dataoff = ip_hdrlen(*pskb) + sizeof(struct udphdr);
        if (dataoff >= (*pskb)->len) {
                DEBUGP("skb->len = %u\n", (*pskb)->len);
                return NF_ACCEPT;