Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6-omap-h63xx.git] / net / atm / clip.c

diff --git a/net/atm/clip.c b/net/atm/clip.c
index 8c38258160852a5a21e4020f51051b1ea2b4d77b..ecf0f79b94ae0d17f9e061433a7e4a9f328f55d9 100644 (file)
--- 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)
 };
 
 
@@ -928,7 +928,7 @@ static int clip_seq_show(struct seq_file *seq, void *v)
        return 0;
 }
 
-static struct seq_operations arp_seq_ops = {
+static const struct seq_operations arp_seq_ops = {
        .start  = clip_seq_start,
        .next   = neigh_seq_next,
        .stop   = neigh_seq_stop,