2 files changed, 4 insertions, 3 deletions

diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index caf9e375a0f1..b97aedce62ae 100644
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -1448,7 +1448,7 @@ static void __exit ip6_tables_fini(void)
 int ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset,
                   int target, unsigned short *fragoff)
 {
-        unsigned int start = (u8 *)(ipv6_hdr(skb) + 1) - skb->data;
+        unsigned int start = skb_network_offset(skb) + sizeof(struct ipv6hdr);
         u8 nexthdr = ipv6_hdr(skb)->nexthdr;
         unsigned int len = skb->len - start;
 
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index b7889ceef556..721f02d7b7f6 100644
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -707,8 +707,9 @@ static int
 find_prev_fhdr(struct sk_buff *skb, u8 *prevhdrp, int *prevhoff, int *fhoff)
 {
         u8 nexthdr = ipv6_hdr(skb)->nexthdr;
-        u8 prev_nhoff = (u8 *)&ipv6_hdr(skb)->nexthdr - skb->data;
-        int start = (u8 *)(ipv6_hdr(skb) + 1) - skb->data;
+        const int netoff = skb_network_offset(skb);
+        u8 prev_nhoff = netoff + offsetof(struct ipv6hdr, nexthdr);
+        int start = netoff + sizeof(struct ipv6hdr);
         int len = skb->len - start;
         u8 prevhdr = NEXTHDR_IPV6;