4 files changed, 31 insertions, 15 deletions

diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index e62ba41b05c5..0d6002fc77b2 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -951,7 +951,7 @@ int x25_rx_call_request(struct sk_buff *skb, struct x25_neigh *nb,
          *      Incoming Call User Data.
          */
         if (skb->len >= 0) {
-                memcpy(makex25->calluserdata.cuddata, skb->data, skb->len);
+                skb_copy_from_linear_data(skb, makex25->calluserdata.cuddata, skb->len);
                 makex25->calluserdata.cudlength = skb->len;
         }
 
@@ -1058,9 +1058,10 @@ static int x25_sendmsg(struct kiocb *iocb, struct socket *sock,
          */
         SOCK_DEBUG(sk, "x25_sendmsg: Copying user data\n");
 
-        asmptr = skb->h.raw = skb_put(skb, len);
+        skb_reset_transport_header(skb);
+        skb_put(skb, len);
 
-        rc = memcpy_fromiovec(asmptr, msg->msg_iov, len);
+        rc = memcpy_fromiovec(skb_transport_header(skb), msg->msg_iov, len);
         if (rc)
                 goto out_kfree_skb;
 
@@ -1210,8 +1211,7 @@ static int x25_recvmsg(struct kiocb *iocb, struct socket *sock,
                 }
         }
 
-        skb->h.raw = skb->data;
-
+        skb_reset_transport_header(skb);
         copied = skb->len;
 
         if (copied > size) {
@@ -1280,6 +1280,12 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                                 rc = sock_get_timestamp(sk,
                                                 (struct timeval __user *)argp);
                         break;
+                case SIOCGSTAMPNS:
+                        rc = -EINVAL;
+                        if (sk)
+                                rc = sock_get_timestampns(sk,
+                                                (struct timespec __user *)argp);
+                        break;
                 case SIOCGIFADDR:
                 case SIOCSIFADDR:
                 case SIOCGIFDSTADDR:
@@ -1521,6 +1527,12 @@ static int compat_x25_ioctl(struct socket *sock, unsigned int cmd,
                         rc = compat_sock_get_timestamp(sk,
                                         (struct timeval __user*)argp);
                 break;
+        case SIOCGSTAMPNS:
+                rc = -EINVAL;
+                if (sk)
+                        rc = compat_sock_get_timestampns(sk,
+                                        (struct timespec __user*)argp);
+                break;
         case SIOCGIFADDR:
         case SIOCSIFADDR:
         case SIOCGIFDSTADDR:
diff --git a/net/x25/x25_dev.c b/net/x25/x25_dev.c
index c7221de98a95..848a6b6f90a6 100644
--- a/net/x25/x25_dev.c
+++ b/net/x25/x25_dev.c
@@ -48,7 +48,7 @@ static int x25_receive_data(struct sk_buff *skb, struct x25_neigh *nb)
         if ((sk = x25_find_socket(lci, nb)) != NULL) {
                 int queued = 1;
 
-                skb->h.raw = skb->data;
+                skb_reset_transport_header(skb);
                 bh_lock_sock(sk);
                 if (!sock_owned_by_user(sk)) {
                         queued = x25_process_rx_frame(sk, skb);
@@ -191,7 +191,7 @@ void x25_send_frame(struct sk_buff *skb, struct x25_neigh *nb)
 {
         unsigned char *dptr;
 
-        skb->nh.raw = skb->data;
+        skb_reset_network_header(skb);
 
         switch (nb->dev->type) {
                 case ARPHRD_X25:
diff --git a/net/x25/x25_in.c b/net/x25/x25_in.c
index c5239fcdefa0..1c88762c2794 100644
--- a/net/x25/x25_in.c
+++ b/net/x25/x25_in.c
@@ -53,17 +53,20 @@ static int x25_queue_rx_frame(struct sock *sk, struct sk_buff *skb, int more)
 
                 skb_queue_tail(&x25->fragment_queue, skb);
 
-                skbn->h.raw = skbn->data;
+                skb_reset_transport_header(skbn);
 
                 skbo = skb_dequeue(&x25->fragment_queue);
-                memcpy(skb_put(skbn, skbo->len), skbo->data, skbo->len);
+                skb_copy_from_linear_data(skbo, skb_put(skbn, skbo->len),
+                                          skbo->len);
                 kfree_skb(skbo);
 
                 while ((skbo =
                         skb_dequeue(&x25->fragment_queue)) != NULL) {
                         skb_pull(skbo, (x25->neighbour->extended) ?
                                         X25_EXT_MIN_LEN : X25_STD_MIN_LEN);
-                        memcpy(skb_put(skbn, skbo->len), skbo->data, skbo->len);
+                        skb_copy_from_linear_data(skbo,
+                                                  skb_put(skbn, skbo->len),
+                                                  skbo->len);
                         kfree_skb(skbo);
                 }
 
@@ -112,8 +115,9 @@ static int x25_state1_machine(struct sock *sk, struct sk_buff *skb, int frametyp
                          *      Copy any Call User Data.
                          */
                         if (skb->len >= 0) {
-                                memcpy(x25->calluserdata.cuddata, skb->data,
-                                       skb->len);
+                                skb_copy_from_linear_data(skb,
+                                              x25->calluserdata.cuddata,
+                                              skb->len);
                                 x25->calluserdata.cudlength = skb->len;
                         }
                         if (!sock_flag(sk, SOCK_DEAD))
diff --git a/net/x25/x25_out.c b/net/x25/x25_out.c
index 6f5737853912..2b96b52114d6 100644
--- a/net/x25/x25_out.c
+++ b/net/x25/x25_out.c
@@ -61,7 +61,7 @@ int x25_output(struct sock *sk, struct sk_buff *skb)
 
         if (skb->len - header_len > max_len) {
                 /* Save a copy of the Header */
-                memcpy(header, skb->data, header_len);
+                skb_copy_from_linear_data(skb, header, header_len);
                 skb_pull(skb, header_len);
 
                 frontlen = skb_headroom(skb);
@@ -84,12 +84,12 @@ int x25_output(struct sock *sk, struct sk_buff *skb)
                         len = max_len > skb->len ? skb->len : max_len;
 
                         /* Copy the user data */
-                        memcpy(skb_put(skbn, len), skb->data, len);
+                        skb_copy_from_linear_data(skb, skb_put(skbn, len), len);
                         skb_pull(skb, len);
 
                         /* Duplicate the Header */
                         skb_push(skbn, header_len);
-                        memcpy(skbn->data, header, header_len);
+                        skb_copy_to_linear_data(skbn, header, header_len);
 
                         if (skb->len > 0) {
                                 if (x25->neighbour->extended)