2.6.25-rc7

 net

 atm

diff --git a/net/atm/lec.c b/net/atm/lec.c
index 7eb1b21..a2efa7f 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -176,7 +176,7 @@ static void lec_handle_bridge(struct sk_buff *skb, struct net_device *dev)
 static unsigned char *get_tr_dst(unsigned char *packet, unsigned char *rdesc)
 {
    struct trh_hdr *trh;
-   int riflen, num_rdsc;
+   unsigned int riflen, num_rdsc;
 
    trh = (struct trh_hdr *)packet;
    if (trh->daddr[0] & (uint8_t) 0x80)
@@ -1249,9 +1249,11 @@ static int __init lane_module_init(void)
 #ifdef CONFIG_PROC_FS
    struct proc_dir_entry *p;
 
-   p = create_proc_entry("lec", S_IRUGO, atm_proc_root);
-   if (p)
-      p->proc_fops = &lec_seq_fops;
+   p = proc_create("lec", S_IRUGO, atm_proc_root, &lec_seq_fops);
+   if (!p) {
+      printk(KERN_ERR "Unable to initialize /proc/net/atm/lec\n");
+      return -ENOMEM;
+   }
 #endif
 
    register_atm_ioctl(&lane_ioctl_ops);
@@ -1789,9 +1791,8 @@ static struct lec_arp_table *make_entry(struct lec_priv *priv,
    }
    memcpy(to_return->mac_addr, mac_addr, ETH_ALEN);
    INIT_HLIST_NODE(&to_return->next);
-   init_timer(&to_return->timer);
-   to_return->timer.function = lec_arp_expire_arp;
-   to_return->timer.data = (unsigned long)to_return;
+   setup_timer(&to_return->timer, lec_arp_expire_arp,
+         (unsigned long)to_return);
    to_return->last_used = jiffies;
    to_return->priv = priv;
    skb_queue_head_init(&to_return->tx_wait);