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, 153 insertions, 0 deletions

diff --git a/drivers/net/pppox.c b/drivers/net/pppox.c
new file mode 100644
index 000000000000..0c1e114527fb
--- /dev/null
+++ b/drivers/net/pppox.c
@@ -0,0 +1,153 @@
+/** -*- linux-c -*- ***********************************************************
+ * Linux PPP over X/Ethernet (PPPoX/PPPoE) Sockets
+ *
+ * PPPoX --- Generic PPP encapsulation socket family
+ * PPPoE --- PPP over Ethernet (RFC 2516)
+ *
+ *
+ * Version:     0.5.2
+ *
+ * Author:      Michal Ostrowski <mostrows@speakeasy.net>
+ *
+ * 051000 :     Initialization cleanup
+ *
+ * License:
+ *              This program is free software; you can redistribute it and/or
+ *              modify it under the terms of the GNU General Public License
+ *              as published by the Free Software Foundation; either version
+ *              2 of the License, or (at your option) any later version.
+ *
+ */
+
+#include <linux/string.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/errno.h>
+#include <linux/netdevice.h>
+#include <linux/net.h>
+#include <linux/init.h>
+#include <linux/if_pppox.h>
+#include <linux/ppp_defs.h>
+#include <linux/if_ppp.h>
+#include <linux/ppp_channel.h>
+
+#include <net/sock.h>
+
+#include <asm/uaccess.h>
+
+static struct pppox_proto *pppox_protos[PX_MAX_PROTO + 1];
+
+int register_pppox_proto(int proto_num, struct pppox_proto *pp)
+{
+        if (proto_num < 0 || proto_num > PX_MAX_PROTO)
+                return -EINVAL;
+        if (pppox_protos[proto_num])
+                return -EALREADY;
+        pppox_protos[proto_num] = pp;
+        return 0;
+}
+
+void unregister_pppox_proto(int proto_num)
+{
+        if (proto_num >= 0 && proto_num <= PX_MAX_PROTO)
+                pppox_protos[proto_num] = NULL;
+}
+
+void pppox_unbind_sock(struct sock *sk)
+{
+        /* Clear connection to ppp device, if attached. */
+
+        if (sk->sk_state & (PPPOX_BOUND | PPPOX_ZOMBIE)) {
+                ppp_unregister_channel(&pppox_sk(sk)->chan);
+                sk->sk_state = PPPOX_DEAD;
+        }
+}
+
+EXPORT_SYMBOL(register_pppox_proto);
+EXPORT_SYMBOL(unregister_pppox_proto);
+EXPORT_SYMBOL(pppox_unbind_sock);
+
+static int pppox_ioctl(struct socket* sock, unsigned int cmd, 
+                       unsigned long arg)
+{
+        struct sock *sk = sock->sk;
+        struct pppox_sock *po = pppox_sk(sk);
+        int rc = 0;
+
+        lock_sock(sk);
+
+        switch (cmd) {
+        case PPPIOCGCHAN: {
+                int index;
+                rc = -ENOTCONN;
+                if (!(sk->sk_state & PPPOX_CONNECTED))
+                        break;
+
+                rc = -EINVAL;
+                index = ppp_channel_index(&po->chan);
+                if (put_user(index , (int __user *) arg))
+                        break;
+
+                rc = 0;
+                sk->sk_state |= PPPOX_BOUND;
+                break;
+        }
+        default:
+                if (pppox_protos[sk->sk_protocol]->ioctl)
+                        rc = pppox_protos[sk->sk_protocol]->ioctl(sock, cmd,
+                                                                  arg);
+
+                break;
+        };
+
+        release_sock(sk);
+        return rc;
+}
+
+
+static int pppox_create(struct socket *sock, int protocol)
+{
+        int rc = -EPROTOTYPE;
+
+        if (protocol < 0 || protocol > PX_MAX_PROTO)
+                goto out;
+
+        rc = -EPROTONOSUPPORT;
+        if (!pppox_protos[protocol] ||
+            !try_module_get(pppox_protos[protocol]->owner))
+                goto out;
+
+        rc = pppox_protos[protocol]->create(sock);
+        if (!rc) {
+                /* We get to set the ioctl handler. */
+                /* For everything else, pppox is just a shell. */
+                sock->ops->ioctl = pppox_ioctl;
+        }
+        module_put(pppox_protos[protocol]->owner);
+out:
+        return rc;
+}
+
+static struct net_proto_family pppox_proto_family = {
+        .family = PF_PPPOX,
+        .create = pppox_create,
+        .owner  = THIS_MODULE,
+};
+
+static int __init pppox_init(void)
+{
+        return sock_register(&pppox_proto_family);
+}
+
+static void __exit pppox_exit(void)
+{
+        sock_unregister(PF_PPPOX);
+}
+
+module_init(pppox_init);
+module_exit(pppox_exit);
+
+MODULE_AUTHOR("Michal Ostrowski <mostrows@speakeasy.net>");
+MODULE_DESCRIPTION("PPP over Ethernet driver (generic socket layer)");
+MODULE_LICENSE("GPL");