Merge branch 'master' into devel and apply fixup from Stephen Rothwell:

vfs/nfs: fixup for nfs_open_context change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

7 files changed, 1597 insertions, 0 deletions

diff --git a/net/nfc/Kconfig b/net/nfc/Kconfig
new file mode 100644
index 000000000000..33e095b124b3
--- /dev/null
+++ b/net/nfc/Kconfig
@@ -0,0 +1,16 @@
+#
+# NFC sybsystem configuration
+#
+
+menuconfig NFC
+        depends on NET && EXPERIMENTAL
+        tristate "NFC subsystem support (EXPERIMENTAL)"
+        default n
+        help
+          Say Y here if you want to build support for NFC (Near field
+          communication) devices.
+
+          To compile this support as a module, choose M here: the module will
+          be called nfc.
+
+source "drivers/nfc/Kconfig"
diff --git a/net/nfc/Makefile b/net/nfc/Makefile
new file mode 100644
index 000000000000..16250c353851
--- /dev/null
+++ b/net/nfc/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for the Linux NFC subsystem.
+#
+
+obj-$(CONFIG_NFC) += nfc.o
+
+nfc-objs := core.o netlink.o af_nfc.o rawsock.o
diff --git a/net/nfc/af_nfc.c b/net/nfc/af_nfc.c
new file mode 100644
index 000000000000..e982cef8f49d
--- /dev/null
+++ b/net/nfc/af_nfc.c
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2011 Instituto Nokia de Tecnologia
+ *
+ * Authors:
+ *    Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
+ *    Lauro Ramos Venancio <lauro.venancio@openbossa.org>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <linux/nfc.h>
+
+#include "nfc.h"
+
+static DEFINE_RWLOCK(proto_tab_lock);
+static const struct nfc_protocol *proto_tab[NFC_SOCKPROTO_MAX];
+
+static int nfc_sock_create(struct net *net, struct socket *sock, int proto,
+                                                                int kern)
+{
+        int rc = -EPROTONOSUPPORT;
+
+        if (net != &init_net)
+                return -EAFNOSUPPORT;
+
+        if (proto < 0 || proto >= NFC_SOCKPROTO_MAX)
+                return -EINVAL;
+
+        read_lock(&proto_tab_lock);
+        if (proto_tab[proto] && try_module_get(proto_tab[proto]->owner)) {
+                rc = proto_tab[proto]->create(net, sock, proto_tab[proto]);
+                module_put(proto_tab[proto]->owner);
+        }
+        read_unlock(&proto_tab_lock);
+
+        return rc;
+}
+
+static struct net_proto_family nfc_sock_family_ops = {
+        .owner  = THIS_MODULE,
+        .family = PF_NFC,
+        .create = nfc_sock_create,
+};
+
+int nfc_proto_register(const struct nfc_protocol *nfc_proto)
+{
+        int rc;
+
+        if (nfc_proto->id < 0 || nfc_proto->id >= NFC_SOCKPROTO_MAX)
+                return -EINVAL;
+
+        rc = proto_register(nfc_proto->proto, 0);
+        if (rc)
+                return rc;
+
+        write_lock(&proto_tab_lock);
+        if (proto_tab[nfc_proto->id])
+                rc = -EBUSY;
+        else
+                proto_tab[nfc_proto->id] = nfc_proto;
+        write_unlock(&proto_tab_lock);
+
+        return rc;
+}
+EXPORT_SYMBOL(nfc_proto_register);
+
+void nfc_proto_unregister(const struct nfc_protocol *nfc_proto)
+{
+        write_lock(&proto_tab_lock);
+        proto_tab[nfc_proto->id] = NULL;
+        write_unlock(&proto_tab_lock);
+
+        proto_unregister(nfc_proto->proto);
+}
+EXPORT_SYMBOL(nfc_proto_unregister);
+
+int __init af_nfc_init(void)
+{
+        return sock_register(&nfc_sock_family_ops);
+}
+
+void af_nfc_exit(void)
+{
+        sock_unregister(PF_NFC);
+}
diff --git a/net/nfc/core.c b/net/nfc/core.c
new file mode 100644
index 000000000000..b6fd4e1f2057
--- /dev/null
+++ b/net/nfc/core.c
@@ -0,0 +1,468 @@
+/*
+ * Copyright (C) 2011 Instituto Nokia de Tecnologia
+ *
+ * Authors:
+ *    Lauro Ramos Venancio <lauro.venancio@openbossa.org>
+ *    Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+
+#include "nfc.h"
+
+#define VERSION "0.1"
+
+int nfc_devlist_generation;
+DEFINE_MUTEX(nfc_devlist_mutex);
+
+int nfc_printk(const char *level, const char *format, ...)
+{
+        struct va_format vaf;
+        va_list args;
+        int r;
+
+        va_start(args, format);
+
+        vaf.fmt = format;
+        vaf.va = &args;
+
+        r = printk("%sNFC: %pV\n", level, &vaf);
+
+        va_end(args);
+
+        return r;
+}
+EXPORT_SYMBOL(nfc_printk);
+
+/**
+ * nfc_start_poll - start polling for nfc targets
+ *
+ * @dev: The nfc device that must start polling
+ * @protocols: bitset of nfc protocols that must be used for polling
+ *
+ * The device remains polling for targets until a target is found or
+ * the nfc_stop_poll function is called.
+ */
+int nfc_start_poll(struct nfc_dev *dev, u32 protocols)
+{
+        int rc;
+
+        nfc_dbg("dev_name=%s protocols=0x%x", dev_name(&dev->dev), protocols);
+
+        if (!protocols)
+                return -EINVAL;
+
+        device_lock(&dev->dev);
+
+        if (!device_is_registered(&dev->dev)) {
+                rc = -ENODEV;
+                goto error;
+        }
+
+        if (dev->polling) {
+                rc = -EBUSY;
+                goto error;
+        }
+
+        rc = dev->ops->start_poll(dev, protocols);
+        if (!rc)
+                dev->polling = true;
+
+error:
+        device_unlock(&dev->dev);
+        return rc;
+}
+
+/**
+ * nfc_stop_poll - stop polling for nfc targets
+ *
+ * @dev: The nfc device that must stop polling
+ */
+int nfc_stop_poll(struct nfc_dev *dev)
+{
+        int rc = 0;
+
+        nfc_dbg("dev_name=%s", dev_name(&dev->dev));
+
+        device_lock(&dev->dev);
+
+        if (!device_is_registered(&dev->dev)) {
+                rc = -ENODEV;
+                goto error;
+        }
+
+        if (!dev->polling) {
+                rc = -EINVAL;
+                goto error;
+        }
+
+        dev->ops->stop_poll(dev);
+        dev->polling = false;
+
+error:
+        device_unlock(&dev->dev);
+        return rc;
+}
+
+/**
+ * nfc_activate_target - prepare the target for data exchange
+ *
+ * @dev: The nfc device that found the target
+ * @target_idx: index of the target that must be activated
+ * @protocol: nfc protocol that will be used for data exchange
+ */
+int nfc_activate_target(struct nfc_dev *dev, u32 target_idx, u32 protocol)
+{
+        int rc;
+
+        nfc_dbg("dev_name=%s target_idx=%u protocol=%u", dev_name(&dev->dev),
+                                                        target_idx, protocol);
+
+        device_lock(&dev->dev);
+
+        if (!device_is_registered(&dev->dev)) {
+                rc = -ENODEV;
+                goto error;
+        }
+
+        rc = dev->ops->activate_target(dev, target_idx, protocol);
+
+error:
+        device_unlock(&dev->dev);
+        return rc;
+}
+
+/**
+ * nfc_deactivate_target - deactivate a nfc target
+ *
+ * @dev: The nfc device that found the target
+ * @target_idx: index of the target that must be deactivated
+ */
+int nfc_deactivate_target(struct nfc_dev *dev, u32 target_idx)
+{
+        int rc = 0;
+
+        nfc_dbg("dev_name=%s target_idx=%u", dev_name(&dev->dev), target_idx);
+
+        device_lock(&dev->dev);
+
+        if (!device_is_registered(&dev->dev)) {
+                rc = -ENODEV;
+                goto error;
+        }
+
+        dev->ops->deactivate_target(dev, target_idx);
+
+error:
+        device_unlock(&dev->dev);
+        return rc;
+}
+
+/**
+ * nfc_data_exchange - transceive data
+ *
+ * @dev: The nfc device that found the target
+ * @target_idx: index of the target
+ * @skb: data to be sent
+ * @cb: callback called when the response is received
+ * @cb_context: parameter for the callback function
+ *
+ * The user must wait for the callback before calling this function again.
+ */
+int nfc_data_exchange(struct nfc_dev *dev, u32 target_idx,
+                                        struct sk_buff *skb,
+                                        data_exchange_cb_t cb,
+                                        void *cb_context)
+{
+        int rc;
+
+        nfc_dbg("dev_name=%s target_idx=%u skb->len=%u", dev_name(&dev->dev),
+                                                        target_idx, skb->len);
+
+        device_lock(&dev->dev);
+
+        if (!device_is_registered(&dev->dev)) {
+                rc = -ENODEV;
+                kfree_skb(skb);
+                goto error;
+        }
+
+        rc = dev->ops->data_exchange(dev, target_idx, skb, cb, cb_context);
+
+error:
+        device_unlock(&dev->dev);
+        return rc;
+}
+
+/**
+ * nfc_alloc_skb - allocate a skb for data exchange responses
+ *
+ * @size: size to allocate
+ * @gfp: gfp flags
+ */
+struct sk_buff *nfc_alloc_skb(unsigned int size, gfp_t gfp)
+{
+        struct sk_buff *skb;
+        unsigned int total_size;
+
+        total_size = size + 1;
+        skb = alloc_skb(total_size, gfp);
+
+        if (skb)
+                skb_reserve(skb, 1);
+
+        return skb;
+}
+EXPORT_SYMBOL(nfc_alloc_skb);
+
+/**
+ * nfc_targets_found - inform that targets were found
+ *
+ * @dev: The nfc device that found the targets
+ * @targets: array of nfc targets found
+ * @ntargets: targets array size
+ *
+ * The device driver must call this function when one or many nfc targets
+ * are found. After calling this function, the device driver must stop
+ * polling for targets.
+ */
+int nfc_targets_found(struct nfc_dev *dev, struct nfc_target *targets,
+                                                        int n_targets)
+{
+        int i;
+
+        nfc_dbg("dev_name=%s n_targets=%d", dev_name(&dev->dev), n_targets);
+
+        dev->polling = false;
+
+        for (i = 0; i < n_targets; i++)
+                targets[i].idx = dev->target_idx++;
+
+        spin_lock_bh(&dev->targets_lock);
+
+        dev->targets_generation++;
+
+        kfree(dev->targets);
+        dev->targets = kmemdup(targets, n_targets * sizeof(struct nfc_target),
+                                                                GFP_ATOMIC);
+
+        if (!dev->targets) {
+                dev->n_targets = 0;
+                spin_unlock_bh(&dev->targets_lock);
+                return -ENOMEM;
+        }
+
+        dev->n_targets = n_targets;
+        spin_unlock_bh(&dev->targets_lock);
+
+        nfc_genl_targets_found(dev);
+
+        return 0;
+}
+EXPORT_SYMBOL(nfc_targets_found);
+
+static void nfc_release(struct device *d)
+{
+        struct nfc_dev *dev = to_nfc_dev(d);
+
+        nfc_dbg("dev_name=%s", dev_name(&dev->dev));
+
+        nfc_genl_data_exit(&dev->genl_data);
+        kfree(dev->targets);
+        kfree(dev);
+}
+
+struct class nfc_class = {
+        .name = "nfc",
+        .dev_release = nfc_release,
+};
+EXPORT_SYMBOL(nfc_class);
+
+static int match_idx(struct device *d, void *data)
+{
+        struct nfc_dev *dev = to_nfc_dev(d);
+        unsigned *idx = data;
+
+        return dev->idx == *idx;
+}
+
+struct nfc_dev *nfc_get_device(unsigned idx)
+{
+        struct device *d;
+
+        d = class_find_device(&nfc_class, NULL, &idx, match_idx);
+        if (!d)
+                return NULL;
+
+        return to_nfc_dev(d);
+}
+
+/**
+ * nfc_allocate_device - allocate a new nfc device
+ *
+ * @ops: device operations
+ * @supported_protocols: NFC protocols supported by the device
+ */
+struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops,
+                                        u32 supported_protocols)
+{
+        static atomic_t dev_no = ATOMIC_INIT(0);
+        struct nfc_dev *dev;
+
+        if (!ops->start_poll || !ops->stop_poll || !ops->activate_target ||
+                !ops->deactivate_target || !ops->data_exchange)
+                return NULL;
+
+        if (!supported_protocols)
+                return NULL;
+
+        dev = kzalloc(sizeof(struct nfc_dev), GFP_KERNEL);
+        if (!dev)
+                return NULL;
+
+        dev->dev.class = &nfc_class;
+        dev->idx = atomic_inc_return(&dev_no) - 1;
+        dev_set_name(&dev->dev, "nfc%d", dev->idx);
+        device_initialize(&dev->dev);
+
+        dev->ops = ops;
+        dev->supported_protocols = supported_protocols;
+
+        spin_lock_init(&dev->targets_lock);
+        nfc_genl_data_init(&dev->genl_data);
+
+        /* first generation must not be 0 */
+        dev->targets_generation = 1;
+
+        return dev;
+}
+EXPORT_SYMBOL(nfc_allocate_device);
+
+/**
+ * nfc_register_device - register a nfc device in the nfc subsystem
+ *
+ * @dev: The nfc device to register
+ */
+int nfc_register_device(struct nfc_dev *dev)
+{
+        int rc;
+
+        nfc_dbg("dev_name=%s", dev_name(&dev->dev));
+
+        mutex_lock(&nfc_devlist_mutex);
+        nfc_devlist_generation++;
+        rc = device_add(&dev->dev);
+        mutex_unlock(&nfc_devlist_mutex);
+
+        if (rc < 0)
+                return rc;
+
+        rc = nfc_genl_device_added(dev);
+        if (rc)
+                nfc_dbg("The userspace won't be notified that the device %s was"
+                                                " added", dev_name(&dev->dev));
+
+
+        return 0;
+}
+EXPORT_SYMBOL(nfc_register_device);
+
+/**
+ * nfc_unregister_device - unregister a nfc device in the nfc subsystem
+ *
+ * @dev: The nfc device to unregister
+ */
+void nfc_unregister_device(struct nfc_dev *dev)
+{
+        int rc;
+
+        nfc_dbg("dev_name=%s", dev_name(&dev->dev));
+
+        mutex_lock(&nfc_devlist_mutex);
+        nfc_devlist_generation++;
+
+        /* lock to avoid unregistering a device while an operation
+           is in progress */
+        device_lock(&dev->dev);
+        device_del(&dev->dev);
+        device_unlock(&dev->dev);
+
+        mutex_unlock(&nfc_devlist_mutex);
+
+        rc = nfc_genl_device_removed(dev);
+        if (rc)
+                nfc_dbg("The userspace won't be notified that the device %s"
+                                        " was removed", dev_name(&dev->dev));
+
+}
+EXPORT_SYMBOL(nfc_unregister_device);
+
+static int __init nfc_init(void)
+{
+        int rc;
+
+        nfc_info("NFC Core ver %s", VERSION);
+
+        rc = class_register(&nfc_class);
+        if (rc)
+                return rc;
+
+        rc = nfc_genl_init();
+        if (rc)
+                goto err_genl;
+
+        /* the first generation must not be 0 */
+        nfc_devlist_generation = 1;
+
+        rc = rawsock_init();
+        if (rc)
+                goto err_rawsock;
+
+        rc = af_nfc_init();
+        if (rc)
+                goto err_af_nfc;
+
+        return 0;
+
+err_af_nfc:
+        rawsock_exit();
+err_rawsock:
+        nfc_genl_exit();
+err_genl:
+        class_unregister(&nfc_class);
+        return rc;
+}
+
+static void __exit nfc_exit(void)
+{
+        af_nfc_exit();
+        rawsock_exit();
+        nfc_genl_exit();
+        class_unregister(&nfc_class);
+}
+
+subsys_initcall(nfc_init);
+module_exit(nfc_exit);
+
+MODULE_AUTHOR("Lauro Ramos Venancio <lauro.venancio@openbossa.org>");
+MODULE_DESCRIPTION("NFC Core ver " VERSION);
+MODULE_VERSION(VERSION);
+MODULE_LICENSE("GPL");
diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c
new file mode 100644
index 000000000000..ccdff7953f7d
--- /dev/null
+++ b/net/nfc/netlink.c
@@ -0,0 +1,537 @@
+/*
+ * Copyright (C) 2011 Instituto Nokia de Tecnologia
+ *
+ * Authors:
+ *    Lauro Ramos Venancio <lauro.venancio@openbossa.org>
+ *    Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <net/genetlink.h>
+#include <linux/nfc.h>
+#include <linux/slab.h>
+
+#include "nfc.h"
+
+static struct genl_multicast_group nfc_genl_event_mcgrp = {
+        .name = NFC_GENL_MCAST_EVENT_NAME,
+};
+
+struct genl_family nfc_genl_family = {
+        .id = GENL_ID_GENERATE,
+        .hdrsize = 0,
+        .name = NFC_GENL_NAME,
+        .version = NFC_GENL_VERSION,
+        .maxattr = NFC_ATTR_MAX,
+};
+
+static const struct nla_policy nfc_genl_policy[NFC_ATTR_MAX + 1] = {
+        [NFC_ATTR_DEVICE_INDEX] = { .type = NLA_U32 },
+        [NFC_ATTR_DEVICE_NAME] = { .type = NLA_STRING,
+                                .len = NFC_DEVICE_NAME_MAXSIZE },
+        [NFC_ATTR_PROTOCOLS] = { .type = NLA_U32 },
+};
+
+static int nfc_genl_send_target(struct sk_buff *msg, struct nfc_target *target,
+                                        struct netlink_callback *cb, int flags)
+{
+        void *hdr;
+
+        nfc_dbg("entry");
+
+        hdr = genlmsg_put(msg, NETLINK_CB(cb->skb).pid, cb->nlh->nlmsg_seq,
+                                &nfc_genl_family, flags, NFC_CMD_GET_TARGET);
+        if (!hdr)
+                return -EMSGSIZE;
+
+        genl_dump_check_consistent(cb, hdr, &nfc_genl_family);
+
+        NLA_PUT_U32(msg, NFC_ATTR_TARGET_INDEX, target->idx);
+        NLA_PUT_U32(msg, NFC_ATTR_PROTOCOLS,
+                                target->supported_protocols);
+        NLA_PUT_U16(msg, NFC_ATTR_TARGET_SENS_RES, target->sens_res);
+        NLA_PUT_U8(msg, NFC_ATTR_TARGET_SEL_RES, target->sel_res);
+
+        return genlmsg_end(msg, hdr);
+
+nla_put_failure:
+        genlmsg_cancel(msg, hdr);
+        return -EMSGSIZE;
+}
+
+static struct nfc_dev *__get_device_from_cb(struct netlink_callback *cb)
+{
+        struct nfc_dev *dev;
+        int rc;
+        u32 idx;
+
+        rc = nlmsg_parse(cb->nlh, GENL_HDRLEN + nfc_genl_family.hdrsize,
+                                                nfc_genl_family.attrbuf,
+                                                nfc_genl_family.maxattr,
+                                                nfc_genl_policy);
+        if (rc < 0)
+                return ERR_PTR(rc);
+
+        if (!nfc_genl_family.attrbuf[NFC_ATTR_DEVICE_INDEX])
+                return ERR_PTR(-EINVAL);
+
+        idx = nla_get_u32(nfc_genl_family.attrbuf[NFC_ATTR_DEVICE_INDEX]);
+
+        dev = nfc_get_device(idx);
+        if (!dev)
+                return ERR_PTR(-ENODEV);
+
+        return dev;
+}
+
+static int nfc_genl_dump_targets(struct sk_buff *skb,
+                                struct netlink_callback *cb)
+{
+        int i = cb->args[0];
+        struct nfc_dev *dev = (struct nfc_dev *) cb->args[1];
+        int rc;
+
+        nfc_dbg("entry");
+
+        if (!dev) {
+                dev = __get_device_from_cb(cb);
+                if (IS_ERR(dev))
+                        return PTR_ERR(dev);
+
+                cb->args[1] = (long) dev;
+        }
+
+        spin_lock_bh(&dev->targets_lock);
+
+        cb->seq = dev->targets_generation;
+
+        while (i < dev->n_targets) {
+                rc = nfc_genl_send_target(skb, &dev->targets[i], cb,
+                                                                NLM_F_MULTI);
+                if (rc < 0)
+                        break;
+
+                i++;
+        }
+
+        spin_unlock_bh(&dev->targets_lock);
+
+        cb->args[0] = i;
+
+        return skb->len;
+}
+
+static int nfc_genl_dump_targets_done(struct netlink_callback *cb)
+{
+        struct nfc_dev *dev = (struct nfc_dev *) cb->args[1];
+
+        nfc_dbg("entry");
+
+        if (dev)
+                nfc_put_device(dev);
+
+        return 0;
+}
+
+int nfc_genl_targets_found(struct nfc_dev *dev)
+{
+        struct sk_buff *msg;
+        void *hdr;
+
+        nfc_dbg("entry");
+
+        dev->genl_data.poll_req_pid = 0;
+
+        msg = nlmsg_new(NLMSG_GOODSIZE, GFP_ATOMIC);
+        if (!msg)
+                return -ENOMEM;
+
+        hdr = genlmsg_put(msg, 0, 0, &nfc_genl_family, 0,
+                                NFC_EVENT_TARGETS_FOUND);
+        if (!hdr)
+                goto free_msg;
+
+        NLA_PUT_U32(msg, NFC_ATTR_DEVICE_INDEX, dev->idx);
+
+        genlmsg_end(msg, hdr);
+
+        return genlmsg_multicast(msg, 0, nfc_genl_event_mcgrp.id, GFP_ATOMIC);
+
+nla_put_failure:
+        genlmsg_cancel(msg, hdr);
+free_msg:
+        nlmsg_free(msg);
+        return -EMSGSIZE;
+}
+
+int nfc_genl_device_added(struct nfc_dev *dev)
+{
+        struct sk_buff *msg;
+        void *hdr;
+
+        nfc_dbg("entry");
+
+        msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+        if (!msg)
+                return -ENOMEM;
+
+        hdr = genlmsg_put(msg, 0, 0, &nfc_genl_family, 0,
+                                NFC_EVENT_DEVICE_ADDED);
+        if (!hdr)
+                goto free_msg;
+
+        NLA_PUT_STRING(msg, NFC_ATTR_DEVICE_NAME, nfc_device_name(dev));
+        NLA_PUT_U32(msg, NFC_ATTR_DEVICE_INDEX, dev->idx);
+        NLA_PUT_U32(msg, NFC_ATTR_PROTOCOLS, dev->supported_protocols);
+
+        genlmsg_end(msg, hdr);
+
+        genlmsg_multicast(msg, 0, nfc_genl_event_mcgrp.id, GFP_KERNEL);
+
+        return 0;
+
+nla_put_failure:
+        genlmsg_cancel(msg, hdr);
+free_msg:
+        nlmsg_free(msg);
+        return -EMSGSIZE;
+}
+
+int nfc_genl_device_removed(struct nfc_dev *dev)
+{
+        struct sk_buff *msg;
+        void *hdr;
+
+        nfc_dbg("entry");
+
+        msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+        if (!msg)
+                return -ENOMEM;
+
+        hdr = genlmsg_put(msg, 0, 0, &nfc_genl_family, 0,
+                                NFC_EVENT_DEVICE_REMOVED);
+        if (!hdr)
+                goto free_msg;
+
+        NLA_PUT_U32(msg, NFC_ATTR_DEVICE_INDEX, dev->idx);
+
+        genlmsg_end(msg, hdr);
+
+        genlmsg_multicast(msg, 0, nfc_genl_event_mcgrp.id, GFP_KERNEL);
+
+        return 0;
+
+nla_put_failure:
+        genlmsg_cancel(msg, hdr);
+free_msg:
+        nlmsg_free(msg);
+        return -EMSGSIZE;
+}
+
+static int nfc_genl_send_device(struct sk_buff *msg, struct nfc_dev *dev,
+                                                u32 pid, u32 seq,
+                                                struct netlink_callback *cb,
+                                                int flags)
+{
+        void *hdr;
+
+        nfc_dbg("entry");
+
+        hdr = genlmsg_put(msg, pid, seq, &nfc_genl_family, flags,
+                                                        NFC_CMD_GET_DEVICE);
+        if (!hdr)
+                return -EMSGSIZE;
+
+        if (cb)
+                genl_dump_check_consistent(cb, hdr, &nfc_genl_family);
+
+        NLA_PUT_STRING(msg, NFC_ATTR_DEVICE_NAME, nfc_device_name(dev));
+        NLA_PUT_U32(msg, NFC_ATTR_DEVICE_INDEX, dev->idx);
+        NLA_PUT_U32(msg, NFC_ATTR_PROTOCOLS, dev->supported_protocols);
+
+        return genlmsg_end(msg, hdr);
+
+nla_put_failure:
+        genlmsg_cancel(msg, hdr);
+        return -EMSGSIZE;
+}
+
+static int nfc_genl_dump_devices(struct sk_buff *skb,
+                                struct netlink_callback *cb)
+{
+        struct class_dev_iter *iter = (struct class_dev_iter *) cb->args[0];
+        struct nfc_dev *dev = (struct nfc_dev *) cb->args[1];
+        bool first_call = false;
+
+        nfc_dbg("entry");
+
+        if (!iter) {
+                first_call = true;
+                iter = kmalloc(sizeof(struct class_dev_iter), GFP_KERNEL);
+                if (!iter)
+                        return -ENOMEM;
+                cb->args[0] = (long) iter;
+        }
+
+        mutex_lock(&nfc_devlist_mutex);
+
+        cb->seq = nfc_devlist_generation;
+
+        if (first_call) {
+                nfc_device_iter_init(iter);
+                dev = nfc_device_iter_next(iter);
+        }
+
+        while (dev) {
+                int rc;
+
+                rc = nfc_genl_send_device(skb, dev, NETLINK_CB(cb->skb).pid,
+                                                        cb->nlh->nlmsg_seq,
+                                                        cb, NLM_F_MULTI);
+                if (rc < 0)
+                        break;
+
+                dev = nfc_device_iter_next(iter);
+        }
+
+        mutex_unlock(&nfc_devlist_mutex);
+
+        cb->args[1] = (long) dev;
+
+        return skb->len;
+}
+
+static int nfc_genl_dump_devices_done(struct netlink_callback *cb)
+{
+        struct class_dev_iter *iter = (struct class_dev_iter *) cb->args[0];
+
+        nfc_dbg("entry");
+
+        nfc_device_iter_exit(iter);
+        kfree(iter);
+
+        return 0;
+}
+
+static int nfc_genl_get_device(struct sk_buff *skb, struct genl_info *info)
+{
+        struct sk_buff *msg;
+        struct nfc_dev *dev;
+        u32 idx;
+        int rc = -ENOBUFS;
+
+        nfc_dbg("entry");
+
+        if (!info->attrs[NFC_ATTR_DEVICE_INDEX])
+                return -EINVAL;
+
+        idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]);
+
+        dev = nfc_get_device(idx);
+        if (!dev)
+                return -ENODEV;
+
+        msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+        if (!msg) {
+                rc = -ENOMEM;
+                goto out_putdev;
+        }
+
+        rc = nfc_genl_send_device(msg, dev, info->snd_pid, info->snd_seq,
+                                                                NULL, 0);
+        if (rc < 0)
+                goto out_free;
+
+        nfc_put_device(dev);
+
+        return genlmsg_reply(msg, info);
+
+out_free:
+        nlmsg_free(msg);
+out_putdev:
+        nfc_put_device(dev);
+        return rc;
+}
+
+static int nfc_genl_start_poll(struct sk_buff *skb, struct genl_info *info)
+{
+        struct nfc_dev *dev;
+        int rc;
+        u32 idx;
+        u32 protocols;
+
+        nfc_dbg("entry");
+
+        if (!info->attrs[NFC_ATTR_DEVICE_INDEX] ||
+                !info->attrs[NFC_ATTR_PROTOCOLS])
+                return -EINVAL;
+
+        idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]);
+        protocols = nla_get_u32(info->attrs[NFC_ATTR_PROTOCOLS]);
+
+        dev = nfc_get_device(idx);
+        if (!dev)
+                return -ENODEV;
+
+        mutex_lock(&dev->genl_data.genl_data_mutex);
+
+        rc = nfc_start_poll(dev, protocols);
+        if (!rc)
+                dev->genl_data.poll_req_pid = info->snd_pid;
+
+        mutex_unlock(&dev->genl_data.genl_data_mutex);
+
+        nfc_put_device(dev);
+        return rc;
+}
+
+static int nfc_genl_stop_poll(struct sk_buff *skb, struct genl_info *info)
+{
+        struct nfc_dev *dev;
+        int rc;
+        u32 idx;
+
+        nfc_dbg("entry");
+
+        if (!info->attrs[NFC_ATTR_DEVICE_INDEX])
+                return -EINVAL;
+
+        idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]);
+
+        dev = nfc_get_device(idx);
+        if (!dev)
+                return -ENODEV;
+
+        mutex_lock(&dev->genl_data.genl_data_mutex);
+
+        if (dev->genl_data.poll_req_pid != info->snd_pid) {
+                rc = -EBUSY;
+                goto out;
+        }
+
+        rc = nfc_stop_poll(dev);
+        dev->genl_data.poll_req_pid = 0;
+
+out:
+        mutex_unlock(&dev->genl_data.genl_data_mutex);
+        nfc_put_device(dev);
+        return rc;
+}
+
+static struct genl_ops nfc_genl_ops[] = {
+        {
+                .cmd = NFC_CMD_GET_DEVICE,
+                .doit = nfc_genl_get_device,
+                .dumpit = nfc_genl_dump_devices,
+                .done = nfc_genl_dump_devices_done,
+                .policy = nfc_genl_policy,
+        },
+        {
+                .cmd = NFC_CMD_START_POLL,
+                .doit = nfc_genl_start_poll,
+                .policy = nfc_genl_policy,
+        },
+        {
+                .cmd = NFC_CMD_STOP_POLL,
+                .doit = nfc_genl_stop_poll,
+                .policy = nfc_genl_policy,
+        },
+        {
+                .cmd = NFC_CMD_GET_TARGET,
+                .dumpit = nfc_genl_dump_targets,
+                .done = nfc_genl_dump_targets_done,
+                .policy = nfc_genl_policy,
+        },
+};
+
+static int nfc_genl_rcv_nl_event(struct notifier_block *this,
+                                                unsigned long event, void *ptr)
+{
+        struct netlink_notify *n = ptr;
+        struct class_dev_iter iter;
+        struct nfc_dev *dev;
+
+        if (event != NETLINK_URELEASE || n->protocol != NETLINK_GENERIC)
+                goto out;
+
+        nfc_dbg("NETLINK_URELEASE event from id %d", n->pid);
+
+        nfc_device_iter_init(&iter);
+        dev = nfc_device_iter_next(&iter);
+
+        while (dev) {
+                mutex_lock(&dev->genl_data.genl_data_mutex);
+                if (dev->genl_data.poll_req_pid == n->pid) {
+                        nfc_stop_poll(dev);
+                        dev->genl_data.poll_req_pid = 0;
+                }
+                mutex_unlock(&dev->genl_data.genl_data_mutex);
+                dev = nfc_device_iter_next(&iter);
+        }
+
+        nfc_device_iter_exit(&iter);
+
+out:
+        return NOTIFY_DONE;
+}
+
+void nfc_genl_data_init(struct nfc_genl_data *genl_data)
+{
+        genl_data->poll_req_pid = 0;
+        mutex_init(&genl_data->genl_data_mutex);
+}
+
+void nfc_genl_data_exit(struct nfc_genl_data *genl_data)
+{
+        mutex_destroy(&genl_data->genl_data_mutex);
+}
+
+static struct notifier_block nl_notifier = {
+        .notifier_call  = nfc_genl_rcv_nl_event,
+};
+
+/**
+ * nfc_genl_init() - Initialize netlink interface
+ *
+ * This initialization function registers the nfc netlink family.
+ */
+int __init nfc_genl_init(void)
+{
+        int rc;
+
+        rc = genl_register_family_with_ops(&nfc_genl_family, nfc_genl_ops,
+                                        ARRAY_SIZE(nfc_genl_ops));
+        if (rc)
+                return rc;
+
+        rc = genl_register_mc_group(&nfc_genl_family, &nfc_genl_event_mcgrp);
+
+        netlink_register_notifier(&nl_notifier);
+
+        return rc;
+}
+
+/**
+ * nfc_genl_exit() - Deinitialize netlink interface
+ *
+ * This exit function unregisters the nfc netlink family.
+ */
+void nfc_genl_exit(void)
+{
+        netlink_unregister_notifier(&nl_notifier);
+        genl_unregister_family(&nfc_genl_family);
+}
diff --git a/net/nfc/nfc.h b/net/nfc/nfc.h
new file mode 100644
index 000000000000..aaf9832298f3
--- /dev/null
+++ b/net/nfc/nfc.h
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2011 Instituto Nokia de Tecnologia
+ *
+ * Authors:
+ *    Lauro Ramos Venancio <lauro.venancio@openbossa.org>
+ *    Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __LOCAL_NFC_H
+#define __LOCAL_NFC_H
+
+#include <net/nfc.h>
+#include <net/sock.h>
+
+__attribute__((format (printf, 2, 3)))
+int nfc_printk(const char *level, const char *fmt, ...);
+
+#define nfc_info(fmt, arg...) nfc_printk(KERN_INFO, fmt, ##arg)
+#define nfc_err(fmt, arg...) nfc_printk(KERN_ERR, fmt, ##arg)
+#define nfc_dbg(fmt, arg...) pr_debug(fmt "\n", ##arg)
+
+struct nfc_protocol {
+        int id;
+        struct proto *proto;
+        struct module *owner;
+        int (*create)(struct net *net, struct socket *sock,
+                        const struct nfc_protocol *nfc_proto);
+};
+
+struct nfc_rawsock {
+        struct sock sk;
+        struct nfc_dev *dev;
+        u32 target_idx;
+        struct work_struct tx_work;
+        bool tx_work_scheduled;
+};
+#define nfc_rawsock(sk) ((struct nfc_rawsock *) sk)
+#define to_rawsock_sk(_tx_work) \
+        ((struct sock *) container_of(_tx_work, struct nfc_rawsock, tx_work))
+
+int __init rawsock_init(void);
+void rawsock_exit(void);
+
+int __init af_nfc_init(void);
+void af_nfc_exit(void);
+int nfc_proto_register(const struct nfc_protocol *nfc_proto);
+void nfc_proto_unregister(const struct nfc_protocol *nfc_proto);
+
+extern int nfc_devlist_generation;
+extern struct mutex nfc_devlist_mutex;
+
+int __init nfc_genl_init(void);
+void nfc_genl_exit(void);
+
+void nfc_genl_data_init(struct nfc_genl_data *genl_data);
+void nfc_genl_data_exit(struct nfc_genl_data *genl_data);
+
+int nfc_genl_targets_found(struct nfc_dev *dev);
+
+int nfc_genl_device_added(struct nfc_dev *dev);
+int nfc_genl_device_removed(struct nfc_dev *dev);
+
+struct nfc_dev *nfc_get_device(unsigned idx);
+
+static inline void nfc_put_device(struct nfc_dev *dev)
+{
+        put_device(&dev->dev);
+}
+
+static inline void nfc_device_iter_init(struct class_dev_iter *iter)
+{
+        class_dev_iter_init(iter, &nfc_class, NULL, NULL);
+}
+
+static inline struct nfc_dev *nfc_device_iter_next(struct class_dev_iter *iter)
+{
+        struct device *d = class_dev_iter_next(iter);
+        if (!d)
+                return NULL;
+
+        return to_nfc_dev(d);
+}
+
+static inline void nfc_device_iter_exit(struct class_dev_iter *iter)
+{
+        class_dev_iter_exit(iter);
+}
+
+int nfc_start_poll(struct nfc_dev *dev, u32 protocols);
+
+int nfc_stop_poll(struct nfc_dev *dev);
+
+int nfc_activate_target(struct nfc_dev *dev, u32 target_idx, u32 protocol);
+
+int nfc_deactivate_target(struct nfc_dev *dev, u32 target_idx);
+
+int nfc_data_exchange(struct nfc_dev *dev, u32 target_idx,
+                                        struct sk_buff *skb,
+                                        data_exchange_cb_t cb,
+                                        void *cb_context);
+
+#endif /* __LOCAL_NFC_H */
diff --git a/net/nfc/rawsock.c b/net/nfc/rawsock.c
new file mode 100644
index 000000000000..52de84a55115
--- /dev/null
+++ b/net/nfc/rawsock.c
@@ -0,0 +1,354 @@
+/*
+ * Copyright (C) 2011 Instituto Nokia de Tecnologia
+ *
+ * Authors:
+ *    Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
+ *    Lauro Ramos Venancio <lauro.venancio@openbossa.org>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <net/tcp_states.h>
+#include <linux/nfc.h>
+
+#include "nfc.h"
+
+static void rawsock_write_queue_purge(struct sock *sk)
+{
+        nfc_dbg("sk=%p", sk);
+
+        spin_lock_bh(&sk->sk_write_queue.lock);
+        __skb_queue_purge(&sk->sk_write_queue);
+        nfc_rawsock(sk)->tx_work_scheduled = false;
+        spin_unlock_bh(&sk->sk_write_queue.lock);
+}
+
+static void rawsock_report_error(struct sock *sk, int err)
+{
+        nfc_dbg("sk=%p err=%d", sk, err);
+
+        sk->sk_shutdown = SHUTDOWN_MASK;
+        sk->sk_err = -err;
+        sk->sk_error_report(sk);
+
+        rawsock_write_queue_purge(sk);
+}
+
+static int rawsock_release(struct socket *sock)
+{
+        struct sock *sk = sock->sk;
+
+        nfc_dbg("sock=%p", sock);
+
+        sock_orphan(sk);
+        sock_put(sk);
+
+        return 0;
+}
+
+static int rawsock_connect(struct socket *sock, struct sockaddr *_addr,
+                                                        int len, int flags)
+{
+        struct sock *sk = sock->sk;
+        struct sockaddr_nfc *addr = (struct sockaddr_nfc *)_addr;
+        struct nfc_dev *dev;
+        int rc = 0;
+
+        nfc_dbg("sock=%p sk=%p flags=%d", sock, sk, flags);
+
+        if (!addr || len < sizeof(struct sockaddr_nfc) ||
+                addr->sa_family != AF_NFC)
+                return -EINVAL;
+
+        nfc_dbg("addr dev_idx=%u target_idx=%u protocol=%u", addr->dev_idx,
+                                        addr->target_idx, addr->nfc_protocol);
+
+        lock_sock(sk);
+
+        if (sock->state == SS_CONNECTED) {
+                rc = -EISCONN;
+                goto error;
+        }
+
+        dev = nfc_get_device(addr->dev_idx);
+        if (!dev) {
+                rc = -ENODEV;
+                goto error;
+        }
+
+        if (addr->target_idx > dev->target_idx - 1 ||
+                addr->target_idx < dev->target_idx - dev->n_targets) {
+                rc = -EINVAL;
+                goto error;
+        }
+
+        if (addr->target_idx > dev->target_idx - 1 ||
+                addr->target_idx < dev->target_idx - dev->n_targets) {
+                rc = -EINVAL;
+                goto error;
+        }
+
+        rc = nfc_activate_target(dev, addr->target_idx, addr->nfc_protocol);
+        if (rc)
+                goto put_dev;
+
+        nfc_rawsock(sk)->dev = dev;
+        nfc_rawsock(sk)->target_idx = addr->target_idx;
+        sock->state = SS_CONNECTED;
+        sk->sk_state = TCP_ESTABLISHED;
+        sk->sk_state_change(sk);
+
+        release_sock(sk);
+        return 0;
+
+put_dev:
+        nfc_put_device(dev);
+error:
+        release_sock(sk);
+        return rc;
+}
+
+static int rawsock_add_header(struct sk_buff *skb)
+{
+
+        if (skb_cow_head(skb, 1))
+                return -ENOMEM;
+
+        *skb_push(skb, 1) = 0;
+
+        return 0;
+}
+
+static void rawsock_data_exchange_complete(void *context, struct sk_buff *skb,
+                                                                int err)
+{
+        struct sock *sk = (struct sock *) context;
+
+        BUG_ON(in_irq());
+
+        nfc_dbg("sk=%p err=%d", sk, err);
+
+        if (err)
+                goto error;
+
+        err = rawsock_add_header(skb);
+        if (err)
+                goto error;
+
+        err = sock_queue_rcv_skb(sk, skb);
+        if (err)
+                goto error;
+
+        spin_lock_bh(&sk->sk_write_queue.lock);
+        if (!skb_queue_empty(&sk->sk_write_queue))
+                schedule_work(&nfc_rawsock(sk)->tx_work);
+        else
+                nfc_rawsock(sk)->tx_work_scheduled = false;
+        spin_unlock_bh(&sk->sk_write_queue.lock);
+
+        sock_put(sk);
+        return;
+
+error:
+        rawsock_report_error(sk, err);
+        sock_put(sk);
+}
+
+static void rawsock_tx_work(struct work_struct *work)
+{
+        struct sock *sk = to_rawsock_sk(work);
+        struct nfc_dev *dev = nfc_rawsock(sk)->dev;
+        u32 target_idx = nfc_rawsock(sk)->target_idx;
+        struct sk_buff *skb;
+        int rc;
+
+        nfc_dbg("sk=%p target_idx=%u", sk, target_idx);
+
+        if (sk->sk_shutdown & SEND_SHUTDOWN) {
+                rawsock_write_queue_purge(sk);
+                return;
+        }
+
+        skb = skb_dequeue(&sk->sk_write_queue);
+
+        sock_hold(sk);
+        rc = nfc_data_exchange(dev, target_idx, skb,
+                                rawsock_data_exchange_complete, sk);
+        if (rc) {
+                rawsock_report_error(sk, rc);
+                sock_put(sk);
+        }
+}
+
+static int rawsock_sendmsg(struct kiocb *iocb, struct socket *sock,
+                                        struct msghdr *msg, size_t len)
+{
+        struct sock *sk = sock->sk;
+        struct sk_buff *skb;
+        int rc;
+
+        nfc_dbg("sock=%p sk=%p len=%zu", sock, sk, len);
+
+        if (msg->msg_namelen)
+                return -EOPNOTSUPP;
+
+        if (sock->state != SS_CONNECTED)
+                return -ENOTCONN;
+
+        skb = sock_alloc_send_skb(sk, len, msg->msg_flags & MSG_DONTWAIT,
+                                                                        &rc);
+        if (!skb)
+                return rc;
+
+        rc = memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len);
+        if (rc < 0) {
+                kfree_skb(skb);
+                return rc;
+        }
+
+        spin_lock_bh(&sk->sk_write_queue.lock);
+        __skb_queue_tail(&sk->sk_write_queue, skb);
+        if (!nfc_rawsock(sk)->tx_work_scheduled) {
+                schedule_work(&nfc_rawsock(sk)->tx_work);
+                nfc_rawsock(sk)->tx_work_scheduled = true;
+        }
+        spin_unlock_bh(&sk->sk_write_queue.lock);
+
+        return len;
+}
+
+static int rawsock_recvmsg(struct kiocb *iocb, struct socket *sock,
+                                struct msghdr *msg, size_t len, int flags)
+{
+        int noblock = flags & MSG_DONTWAIT;
+        struct sock *sk = sock->sk;
+        struct sk_buff *skb;
+        int copied;
+        int rc;
+
+        nfc_dbg("sock=%p sk=%p len=%zu flags=%d", sock, sk, len, flags);
+
+        skb = skb_recv_datagram(sk, flags, noblock, &rc);
+        if (!skb)
+                return rc;
+
+        msg->msg_namelen = 0;
+
+        copied = skb->len;
+        if (len < copied) {
+                msg->msg_flags |= MSG_TRUNC;
+                copied = len;
+        }
+
+        rc = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
+
+        skb_free_datagram(sk, skb);
+
+        return rc ? : copied;
+}
+
+
+static const struct proto_ops rawsock_ops = {
+        .family         = PF_NFC,
+        .owner          = THIS_MODULE,
+        .release        = rawsock_release,
+        .bind           = sock_no_bind,
+        .connect        = rawsock_connect,
+        .socketpair     = sock_no_socketpair,
+        .accept         = sock_no_accept,
+        .getname        = sock_no_getname,
+        .poll           = datagram_poll,
+        .ioctl          = sock_no_ioctl,
+        .listen         = sock_no_listen,
+        .shutdown       = sock_no_shutdown,
+        .setsockopt     = sock_no_setsockopt,
+        .getsockopt     = sock_no_getsockopt,
+        .sendmsg        = rawsock_sendmsg,
+        .recvmsg        = rawsock_recvmsg,
+        .mmap           = sock_no_mmap,
+};
+
+static void rawsock_destruct(struct sock *sk)
+{
+        nfc_dbg("sk=%p", sk);
+
+        if (sk->sk_state == TCP_ESTABLISHED) {
+                nfc_deactivate_target(nfc_rawsock(sk)->dev,
+                                        nfc_rawsock(sk)->target_idx);
+                nfc_put_device(nfc_rawsock(sk)->dev);
+        }
+
+        skb_queue_purge(&sk->sk_receive_queue);
+
+        if (!sock_flag(sk, SOCK_DEAD)) {
+                nfc_err("Freeing alive NFC raw socket %p", sk);
+                return;
+        }
+}
+
+static int rawsock_create(struct net *net, struct socket *sock,
+                                const struct nfc_protocol *nfc_proto)
+{
+        struct sock *sk;
+
+        nfc_dbg("sock=%p", sock);
+
+        if (sock->type != SOCK_SEQPACKET)
+                return -ESOCKTNOSUPPORT;
+
+        sock->ops = &rawsock_ops;
+
+        sk = sk_alloc(net, PF_NFC, GFP_KERNEL, nfc_proto->proto);
+        if (!sk)
+                return -ENOMEM;
+
+        sock_init_data(sock, sk);
+        sk->sk_protocol = nfc_proto->id;
+        sk->sk_destruct = rawsock_destruct;
+        sock->state = SS_UNCONNECTED;
+
+        INIT_WORK(&nfc_rawsock(sk)->tx_work, rawsock_tx_work);
+        nfc_rawsock(sk)->tx_work_scheduled = false;
+
+        return 0;
+}
+
+static struct proto rawsock_proto = {
+        .name     = "NFC_RAW",
+        .owner    = THIS_MODULE,
+        .obj_size = sizeof(struct nfc_rawsock),
+};
+
+static const struct nfc_protocol rawsock_nfc_proto = {
+        .id       = NFC_SOCKPROTO_RAW,
+        .proto    = &rawsock_proto,
+        .owner    = THIS_MODULE,
+        .create   = rawsock_create
+};
+
+int __init rawsock_init(void)
+{
+        int rc;
+
+        rc = nfc_proto_register(&rawsock_nfc_proto);
+
+        return rc;
+}
+
+void rawsock_exit(void)
+{
+        nfc_proto_unregister(&rawsock_nfc_proto);
+}