Linux-2.6.12-rc2v2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

1 files changed, 190 insertions, 0 deletions

diff --git a/drivers/isdn/i4l/isdn_net.h b/drivers/isdn/i4l/isdn_net.h
new file mode 100644
index 000000000000..bc2f0dd962ea
--- /dev/null
+++ b/drivers/isdn/i4l/isdn_net.h
@@ -0,0 +1,190 @@
+/* $Id: isdn_net.h,v 1.1.2.2 2004/01/12 22:37:19 keil Exp $
+ *
+ * header for Linux ISDN subsystem, network related functions (linklevel).
+ *
+ * Copyright 1994-1999  by Fritz Elfert (fritz@isdn4linux.de)
+ * Copyright 1995,96    by Thinking Objects Software GmbH Wuerzburg
+ * Copyright 1995,96    by Michael Hipp (Michael.Hipp@student.uni-tuebingen.de)
+ *
+ * This software may be used and distributed according to the terms
+ * of the GNU General Public License, incorporated herein by reference.
+ *
+ */
+
+                              /* Definitions for hupflags:                */
+#define ISDN_WAITCHARGE  1      /* did not get a charge info yet            */
+#define ISDN_HAVECHARGE  2      /* We know a charge info                    */
+#define ISDN_CHARGEHUP   4      /* We want to use the charge mechanism      */
+#define ISDN_INHUP       8      /* Even if incoming, close after huptimeout */
+#define ISDN_MANCHARGE  16      /* Charge Interval manually set             */
+
+/*
+ * Definitions for Cisco-HDLC header.
+ */
+
+#define CISCO_ADDR_UNICAST    0x0f
+#define CISCO_ADDR_BROADCAST  0x8f
+#define CISCO_CTRL            0x00
+#define CISCO_TYPE_CDP        0x2000
+#define CISCO_TYPE_SLARP      0x8035
+#define CISCO_SLARP_REQUEST   0
+#define CISCO_SLARP_REPLY     1
+#define CISCO_SLARP_KEEPALIVE 2
+
+extern char *isdn_net_new(char *, struct net_device *);
+extern char *isdn_net_newslave(char *);
+extern int isdn_net_rm(char *);
+extern int isdn_net_rmall(void);
+extern int isdn_net_stat_callback(int, isdn_ctrl *);
+extern int isdn_net_setcfg(isdn_net_ioctl_cfg *);
+extern int isdn_net_getcfg(isdn_net_ioctl_cfg *);
+extern int isdn_net_addphone(isdn_net_ioctl_phone *);
+extern int isdn_net_getphones(isdn_net_ioctl_phone *, char __user *);
+extern int isdn_net_getpeer(isdn_net_ioctl_phone *, isdn_net_ioctl_phone __user *);
+extern int isdn_net_delphone(isdn_net_ioctl_phone *);
+extern int isdn_net_find_icall(int, int, int, setup_parm *);
+extern void isdn_net_hangup(struct net_device *);
+extern void isdn_net_dial(void);
+extern void isdn_net_autohup(void);
+extern int isdn_net_force_hangup(char *);
+extern int isdn_net_force_dial(char *);
+extern isdn_net_dev *isdn_net_findif(char *);
+extern int isdn_net_rcv_skb(int, struct sk_buff *);
+extern int isdn_net_dial_req(isdn_net_local *);
+extern void isdn_net_writebuf_skb(isdn_net_local *lp, struct sk_buff *skb);
+extern void isdn_net_write_super(isdn_net_local *lp, struct sk_buff *skb);
+
+#define ISDN_NET_MAX_QUEUE_LENGTH 2
+
+/*
+ * is this particular channel busy?
+ */
+static __inline__ int isdn_net_lp_busy(isdn_net_local *lp)
+{
+        if (atomic_read(&lp->frame_cnt) < ISDN_NET_MAX_QUEUE_LENGTH)
+                return 0;
+        else 
+                return 1;
+}
+
+/*
+ * For the given net device, this will get a non-busy channel out of the
+ * corresponding bundle. The returned channel is locked.
+ */
+static __inline__ isdn_net_local * isdn_net_get_locked_lp(isdn_net_dev *nd)
+{
+        unsigned long flags;
+        isdn_net_local *lp;
+
+        spin_lock_irqsave(&nd->queue_lock, flags);
+        lp = nd->queue;         /* get lp on top of queue */
+        spin_lock(&nd->queue->xmit_lock);
+        while (isdn_net_lp_busy(nd->queue)) {
+                spin_unlock(&nd->queue->xmit_lock);
+                nd->queue = nd->queue->next;
+                if (nd->queue == lp) { /* not found -- should never happen */
+                        lp = NULL;
+                        goto errout;
+                }
+                spin_lock(&nd->queue->xmit_lock);
+        }
+        lp = nd->queue;
+        nd->queue = nd->queue->next;
+        local_bh_disable();
+errout:
+        spin_unlock_irqrestore(&nd->queue_lock, flags);
+        return lp;
+}
+
+/*
+ * add a channel to a bundle
+ */
+static __inline__ void isdn_net_add_to_bundle(isdn_net_dev *nd, isdn_net_local *nlp)
+{
+        isdn_net_local *lp;
+        unsigned long flags;
+
+        spin_lock_irqsave(&nd->queue_lock, flags);
+
+        lp = nd->queue;
+//      printk(KERN_DEBUG "%s: lp:%s(%p) nlp:%s(%p) last(%p)\n",
+//              __FUNCTION__, lp->name, lp, nlp->name, nlp, lp->last);
+        nlp->last = lp->last;
+        lp->last->next = nlp;
+        lp->last = nlp;
+        nlp->next = lp;
+        nd->queue = nlp;
+
+        spin_unlock_irqrestore(&nd->queue_lock, flags);
+}
+/*
+ * remove a channel from the bundle it belongs to
+ */
+static __inline__ void isdn_net_rm_from_bundle(isdn_net_local *lp)
+{
+        isdn_net_local *master_lp = lp;
+        unsigned long flags;
+
+        if (lp->master)
+                master_lp = (isdn_net_local *) lp->master->priv;
+
+//      printk(KERN_DEBUG "%s: lp:%s(%p) mlp:%s(%p) last(%p) next(%p) mndq(%p)\n",
+//              __FUNCTION__, lp->name, lp, master_lp->name, master_lp, lp->last, lp->next, master_lp->netdev->queue);
+        spin_lock_irqsave(&master_lp->netdev->queue_lock, flags);
+        lp->last->next = lp->next;
+        lp->next->last = lp->last;
+        if (master_lp->netdev->queue == lp) {
+                master_lp->netdev->queue = lp->next;
+                if (lp->next == lp) { /* last in queue */
+                        master_lp->netdev->queue = master_lp->netdev->local;
+                }
+        }
+        lp->next = lp->last = lp;       /* (re)set own pointers */
+//      printk(KERN_DEBUG "%s: mndq(%p)\n",
+//              __FUNCTION__, master_lp->netdev->queue);
+        spin_unlock_irqrestore(&master_lp->netdev->queue_lock, flags);
+}
+
+static inline int
+put_u8(unsigned char *p, u8 x)
+{
+        *p = x;
+        return 1;
+}
+
+static inline int
+put_u16(unsigned char *p, u16 x)
+{
+        *((u16 *)p) = htons(x);
+        return 2;
+}
+
+static inline int
+put_u32(unsigned char *p, u32 x)
+{
+        *((u32 *)p) = htonl(x);
+        return 4;
+}
+
+static inline int
+get_u8(unsigned char *p, u8 *x)
+{
+        *x = *p;
+        return 1;
+}
+
+static inline int
+get_u16(unsigned char *p, u16 *x)
+{
+        *x = ntohs(*((u16 *)p));
+        return 2;
+}
+
+static inline int
+get_u32(unsigned char *p, u32 *x)
+{
+        *x = ntohl(*((u32 *)p));
+        return 4;
+}
+
+