1 files changed, 7 insertions, 5 deletions

diff --git a/net/ax25/ax25_out.c b/net/ax25/ax25_out.c
index 223835092b7a..92b517af7260 100644
--- a/net/ax25/ax25_out.c
+++ b/net/ax25/ax25_out.c
@@ -148,8 +148,9 @@ void ax25_output(ax25_cb *ax25, int paclen, struct sk_buff *skb)
 
                         if (ka9qfrag == 1) {
                                 skb_reserve(skbn, frontlen + 2);
-                                skbn->nh.raw = skbn->data + (skb->nh.raw - skb->data);
-                                memcpy(skb_put(skbn, len), skb->data, len);
+                                skb_set_network_header(skbn,
+                                                      skb_network_offset(skb));
+                                skb_copy_from_linear_data(skb, skb_put(skbn, len), len);
                                 p = skb_push(skbn, 2);
 
                                 *p++ = AX25_P_SEGMENT;
@@ -161,8 +162,9 @@ void ax25_output(ax25_cb *ax25, int paclen, struct sk_buff *skb)
                                 }
                         } else {
                                 skb_reserve(skbn, frontlen + 1);
-                                skbn->nh.raw = skbn->data + (skb->nh.raw - skb->data);
-                                memcpy(skb_put(skbn, len), skb->data, len);
+                                skb_set_network_header(skbn,
+                                                      skb_network_offset(skb));
+                                skb_copy_from_linear_data(skb, skb_put(skbn, len), len);
                                 p = skb_push(skbn, 1);
                                 *p = AX25_P_TEXT;
                         }
@@ -205,7 +207,7 @@ static void ax25_send_iframe(ax25_cb *ax25, struct sk_buff *skb, int poll_bit)
         if (skb == NULL)
                 return;
 
-        skb->nh.raw = skb->data;
+        skb_reset_network_header(skb);
 
         if (ax25->modulus == AX25_MODULUS) {
                 frame = skb_push(skb, 1);