[SK_BUFF]: Introduce skb_set_network_header

For the cases where the network header is being set to a offset from skb->data.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 4 insertions, 3 deletions

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index eae228469627..15de9d43950e 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -928,9 +928,9 @@ alloc_new_skb:
                          *      Find where to start putting bytes.
                          */
                         data = skb_put(skb, fraglen);
-                        skb->nh.raw = data + exthdrlen;
+                        skb_set_network_header(skb, exthdrlen);
+                        skb->h.raw = skb->nh.raw + fragheaderlen;
                         data += fragheaderlen;
-                        skb->h.raw = data + exthdrlen;
 
                         if (fraggap) {
                                 skb->csum = skb_copy_and_csum_bits(
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 00190835cea1..5da823a32250 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -3634,7 +3634,8 @@ tcp_collapse(struct sock *sk, struct sk_buff_head *list,
                         return;
 
                 skb_set_mac_header(nskb, skb_mac_header(skb) - skb->head);
-                nskb->nh.raw = nskb->data + (skb_network_header(skb) - skb->head);
+                skb_set_network_header(nskb,
+                                       skb_network_header(skb) - skb->head);
                 nskb->h.raw = nskb->data + (skb->h.raw - skb->head);
 
                 skb_reserve(nskb, header);