6 files changed, 27 insertions, 22 deletions

diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index ec4ebd3299e3..0e9f00c5c899 100644
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -173,7 +173,7 @@ static int br2684_xmit_vcc(struct sk_buff *skb, struct br2684_dev *brdev,
         }
         skb_push(skb, minheadroom);
         if (brvcc->encaps == e_llc)
-                memcpy(skb->data, llc_oui_pid_pad, 10);
+                skb_copy_to_linear_data(skb, llc_oui_pid_pad, 10);
         else
                 memset(skb->data, 0, 2);
 #endif /* FASTER_VERSION */
@@ -375,11 +375,11 @@ packet_fails_filter(__be16 type, struct br2684_vcc *brvcc, struct sk_buff *skb)
 {
         if (brvcc->filter.netmask == 0)
                 return 0;                       /* no filter in place */
-        if (type == __constant_htons(ETH_P_IP) &&
+        if (type == htons(ETH_P_IP) &&
             (((struct iphdr *) (skb->data))->daddr & brvcc->filter.
              netmask) == brvcc->filter.prefix)
                 return 0;
-        if (type == __constant_htons(ETH_P_ARP))
+        if (type == htons(ETH_P_ARP))
                 return 0;
         /* TODO: we should probably filter ARPs too.. don't want to have
          *   them returning values that don't make sense, or is that ok?
@@ -458,7 +458,7 @@ static void br2684_push(struct atm_vcc *atmvcc, struct sk_buff *skb)
         /* FIXME: tcpdump shows that pointer to mac header is 2 bytes earlier,
            than should be. What else should I set? */
         skb_pull(skb, plen);
-        skb->mac.raw = ((char *) (skb->data)) - ETH_HLEN;
+        skb_set_mac_header(skb, -ETH_HLEN);
         skb->pkt_type = PACKET_HOST;
 #ifdef CONFIG_BR2684_FAST_TRANS
         skb->protocol = ((u16 *) skb->data)[-1];
diff --git a/net/atm/clip.c b/net/atm/clip.c
index 8c3825816085..876b77f14745 100644
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -213,7 +213,7 @@ static void clip_push(struct atm_vcc *vcc, struct sk_buff *skb)
                 return;
         }
         ATM_SKB(skb)->vcc = vcc;
-        skb->mac.raw = skb->data;
+        skb_reset_mac_header(skb);
         if (!clip_vcc->encap
             || skb->len < RFC1483LLC_LEN
             || memcmp(skb->data, llc_oui, sizeof (llc_oui)))
@@ -702,7 +702,7 @@ static struct atm_dev atmarpd_dev = {
         .ops =                  &atmarpd_dev_ops,
         .type =                 "arpd",
         .number =               999,
-        .lock =                 SPIN_LOCK_UNLOCKED
+        .lock =                 __SPIN_LOCK_UNLOCKED(atmarpd_dev.lock)
 };
 
 
diff --git a/net/atm/ioctl.c b/net/atm/ioctl.c
index 8ccee4591f65..7afd8e7754fd 100644
--- a/net/atm/ioctl.c
+++ b/net/atm/ioctl.c
@@ -82,6 +82,9 @@ int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                 case SIOCGSTAMP: /* borrowed from IP */
                         error = sock_get_timestamp(sk, argp);
                         goto done;
+                case SIOCGSTAMPNS: /* borrowed from IP */
+                        error = sock_get_timestampns(sk, argp);
+                        goto done;
                 case ATM_SETSC:
                         printk(KERN_WARNING "ATM_SETSC is obsolete\n");
                         error = 0;
diff --git a/net/atm/lec.c b/net/atm/lec.c
index 3d804d61f656..4dc5f2b8c43c 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -283,8 +283,8 @@ static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev)
         }
 
         DPRINTK("skbuff head:%lx data:%lx tail:%lx end:%lx\n",
-                (long)skb->head, (long)skb->data, (long)skb->tail,
-                (long)skb->end);
+                (long)skb->head, (long)skb->data, (long)skb_tail_pointer(skb),
+                (long)skb_end_pointer(skb));
 #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
         if (memcmp(skb->data, bridge_ula_lec, sizeof(bridge_ula_lec)) == 0)
                 lec_handle_bridge(skb, dev);
@@ -576,8 +576,8 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)
                                         break;
                                 }
                                 skb2->len = sizeof(struct atmlec_msg);
-                                memcpy(skb2->data, mesg,
-                                       sizeof(struct atmlec_msg));
+                                skb_copy_to_linear_data(skb2, mesg,
+                                                        sizeof(*mesg));
                                 atm_force_charge(priv->lecd, skb2->truesize);
                                 sk = sk_atm(priv->lecd);
                                 skb_queue_tail(&sk->sk_receive_queue, skb2);
@@ -630,7 +630,7 @@ static struct atm_dev lecatm_dev = {
         .ops = &lecdev_ops,
         .type = "lec",
         .number = 999,          /* dummy device number */
-        .lock = SPIN_LOCK_UNLOCKED
+        .lock = __SPIN_LOCK_UNLOCKED(lecatm_dev.lock)
 };
 
 /*
@@ -825,7 +825,6 @@ static void lec_push(struct atm_vcc *vcc, struct sk_buff *skb)
                 if (!hlist_empty(&priv->lec_arp_empty_ones)) {
                         lec_arp_check_empties(priv, vcc, skb);
                 }
-                skb->dev = dev;
                 skb_pull(skb, 2);       /* skip lec_id */
 #ifdef CONFIG_TR
                 if (priv->is_trdev)
@@ -1338,7 +1337,7 @@ static int lane2_resolve(struct net_device *dev, u8 *dst_mac, int force,
                 if (skb == NULL)
                         return -1;
                 skb->len = *sizeoftlvs;
-                memcpy(skb->data, *tlvs, *sizeoftlvs);
+                skb_copy_to_linear_data(skb, *tlvs, *sizeoftlvs);
                 retval = send_to_lecd(priv, l_arp_xmt, dst_mac, NULL, skb);
         }
         return retval;
@@ -1372,7 +1371,7 @@ static int lane2_associate_req(struct net_device *dev, u8 *lan_dst,
         if (skb == NULL)
                 return 0;
         skb->len = sizeoftlvs;
-        memcpy(skb->data, tlvs, sizeoftlvs);
+        skb_copy_to_linear_data(skb, tlvs, sizeoftlvs);
         retval = send_to_lecd(priv, l_associate_req, NULL, NULL, skb);
         if (retval != 0)
                 printk("lec.c: lane2_associate_req() failed\n");
diff --git a/net/atm/mpc.c b/net/atm/mpc.c
index cb3c004ff022..7c85aa551d5e 100644
--- a/net/atm/mpc.c
+++ b/net/atm/mpc.c
@@ -504,11 +504,13 @@ static int send_via_shortcut(struct sk_buff *skb, struct mpoa_client *mpc)
                 tagged_llc_snap_hdr.tag = entry->ctrl_info.tag;
                 skb_pull(skb, ETH_HLEN);                       /* get rid of Eth header */
                 skb_push(skb, sizeof(tagged_llc_snap_hdr));    /* add LLC/SNAP header   */
-                memcpy(skb->data, &tagged_llc_snap_hdr, sizeof(tagged_llc_snap_hdr));
+                skb_copy_to_linear_data(skb, &tagged_llc_snap_hdr,
+                                        sizeof(tagged_llc_snap_hdr));
         } else {
                 skb_pull(skb, ETH_HLEN);                        /* get rid of Eth header */
                 skb_push(skb, sizeof(struct llc_snap_hdr));     /* add LLC/SNAP header + tag  */
-                memcpy(skb->data, &llc_snap_mpoa_data, sizeof(struct llc_snap_hdr));
+                skb_copy_to_linear_data(skb, &llc_snap_mpoa_data,
+                                        sizeof(struct llc_snap_hdr));
         }
 
         atomic_add(skb->truesize, &sk_atm(entry->shortcut)->sk_wmem_alloc);
@@ -711,11 +713,12 @@ static void mpc_push(struct atm_vcc *vcc, struct sk_buff *skb)
                 return;
         }
         skb_push(new_skb, eg->ctrl_info.DH_length);     /* add MAC header */
-        memcpy(new_skb->data, eg->ctrl_info.DLL_header, eg->ctrl_info.DH_length);
+        skb_copy_to_linear_data(new_skb, eg->ctrl_info.DLL_header,
+                                eg->ctrl_info.DH_length);
         new_skb->protocol = eth_type_trans(new_skb, dev);
-        new_skb->nh.raw = new_skb->data;
+        skb_reset_network_header(new_skb);
 
-        eg->latest_ip_addr = new_skb->nh.iph->saddr;
+        eg->latest_ip_addr = ip_hdr(new_skb)->saddr;
         eg->packets_rcvd++;
         mpc->eg_ops->put(eg);
 
@@ -734,7 +737,7 @@ static struct atm_dev mpc_dev = {
         .ops    = &mpc_ops,
         .type   = "mpc",
         .number = 42,
-        .lock   = SPIN_LOCK_UNLOCKED
+        .lock   = __SPIN_LOCK_UNLOCKED(mpc_dev.lock)
         /* members not explicitly initialised will be 0 */
 };
 
@@ -936,7 +939,7 @@ int msg_to_mpoad(struct k_message *mesg, struct mpoa_client *mpc)
         if (skb == NULL)
                 return -ENOMEM;
         skb_put(skb, sizeof(struct k_message));
-        memcpy(skb->data, mesg, sizeof(struct k_message));
+        skb_copy_to_linear_data(skb, mesg, sizeof(*mesg));
         atm_force_charge(mpc->mpoad_vcc, skb->truesize);
 
         sk = sk_atm(mpc->mpoad_vcc);
diff --git a/net/atm/signaling.c b/net/atm/signaling.c
index 31d98b57e1de..d14baaf1f4c3 100644
--- a/net/atm/signaling.c
+++ b/net/atm/signaling.c
@@ -256,7 +256,7 @@ static struct atm_dev sigd_dev = {
         .ops =          &sigd_dev_ops,
         .type =         "sig",
         .number =       999,
-        .lock =         SPIN_LOCK_UNLOCKED
+        .lock =         __SPIN_LOCK_UNLOCKED(sigd_dev.lock)
 };