Merge branch 'pandora-27-omap1' into rev2

[pandora-kernel.git] / net / atm / lec_arpc.h

diff --git a/net/atm/lec_arpc.h b/net/atm/lec_arpc.h
index 0230ca1..ec67435 100644 (file)
--- a/net/atm/lec_arpc.h
+++ b/net/atm/lec_arpc.h
@@ -11,7 +11,7 @@
 #include <linux/atmlec.h>
 
 struct lec_arp_table {
-       struct lec_arp_table *next;     /* Linked entry list */
+       struct hlist_node next;         /* Linked entry list */
        unsigned char atm_addr[ATM_ESA_LEN];    /* Atm address */
        unsigned char mac_addr[ETH_ALEN];       /* Mac address */
        int is_rdesc;                   /* Mac address is a route descriptor */
@@ -24,9 +24,6 @@ struct lec_arp_table {
        void (*old_recv_push) (struct atm_vcc *vcc, struct sk_buff *skb);
                                        /* Push that leads to daemon */
 
-       void (*old_close) (struct atm_vcc *vcc);
-                                       /* We want to see when this vcc gets closed */
-
        unsigned long last_used;        /* For expiry */
        unsigned long timestamp;        /* Used for various timestamping things:
                                         * 1. FLUSH started
@@ -50,6 +47,7 @@ struct lec_arp_table {
                                         * the length of the tlvs array
                                         */
        struct sk_buff_head tx_wait;    /* wait queue for outgoing packets */
+       atomic_t usage;                 /* usage count */
 };
 
 /*