Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 30 Apr 2013 07:50:54 +0000 (03:50 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 30 Apr 2013 07:55:20 +0000 (03:55 -0400)
Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/emulex/benet/be.h
include/net/tcp.h
net/mac802154/mac802154.h

Most conflicts were minor overlapping stuff.

The be2net driver brought in some fixes that added __vlan_put_tag
calls, which in net-next take an additional argument.

Signed-off-by: David S. Miller <davem@davemloft.net>
20 files changed:
1  2 
drivers/net/bonding/bond_main.c
drivers/net/caif/caif_spi.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/emulex/benet/be.h
drivers/net/ethernet/emulex/benet/be_cmds.c
drivers/net/ethernet/emulex/benet/be_cmds.h
drivers/net/ethernet/emulex/benet/be_ethtool.c
drivers/net/ethernet/emulex/benet/be_main.c
drivers/net/ethernet/freescale/gianfar_ptp.c
drivers/net/ethernet/realtek/r8169.c
drivers/net/tun.c
net/batman-adv/routing.c
net/core/datagram.c
net/ipv4/tcp_ipv4.c
net/mac802154/mac802154.h
net/netfilter/ipvs/ip_vs_pe_sip.c
net/nfc/llcp_sock.c
net/unix/af_unix.c

Simple merge
Simple merge
index 91a0434ce1bdb5d640af56dc46b89a97aa240f6a,a8f1ee31de774cfbd85715daf5ee776a56f0c4a5..a024eec94be1eb166694d4d220c7f7d943d92676
@@@ -6041,19 -6030,22 +6042,27 @@@ void bnx2x_pre_irq_nic_init(struct bnx2
        rmb();
        bnx2x_init_rx_rings(bp);
        bnx2x_init_tx_rings(bp);
-       /* Initialize MOD_ABS interrupts */
-       bnx2x_init_mod_abs_int(bp, &bp->link_vars, bp->common.chip_id,
-                              bp->common.shmem_base, bp->common.shmem2_base,
-                              BP_PORT(bp));
 +      if (IS_VF(bp)) {
 +              bnx2x_memset_stats(bp);
 +              return;
 +      }
 +
+       if (IS_PF(bp)) {
+               /* Initialize MOD_ABS interrupts */
+               bnx2x_init_mod_abs_int(bp, &bp->link_vars, bp->common.chip_id,
+                                      bp->common.shmem_base,
+                                      bp->common.shmem2_base, BP_PORT(bp));
+               /* initialize the default status block and sp ring */
+               bnx2x_init_def_sb(bp);
+               bnx2x_update_dsb_idx(bp);
+               bnx2x_init_sp_ring(bp);
+       }
+ }
  
-       bnx2x_init_def_sb(bp);
-       bnx2x_update_dsb_idx(bp);
-       bnx2x_init_sp_ring(bp);
+ void bnx2x_post_irq_nic_init(struct bnx2x *bp, u32 load_code)
+ {
        bnx2x_init_eq_ring(bp);
        bnx2x_init_internal(bp, load_code);
        bnx2x_pf_init(bp);
index 9045903dcda3f6c0983ccb75455acaa90514d417,941aa1f5cf9b05b12648f5aed8cb46c59f3eec1e..234ce6f07544822152075bd4401492237647a9cd
@@@ -435,7 -435,7 +436,8 @@@ struct be_adapter 
        u8 wol_cap;
        bool wol;
        u32 uc_macs;            /* Count of secondary UC MAC programmed */
 +      u16 asic_rev;
+       u16 qnq_vid;
        u32 msg_enable;
        int be_get_temp_freq;
        u16 max_mcast_mac;
index 1c734915933f4c77c8b76eedaa800bfde2bd6e6b,1232e9164bf1b83f9e7fe641e5af0e6f4e370421..4babc8a4a54396b9dfbb64dd0292f5ade612021c
@@@ -777,6 -762,31 +775,31 @@@ static struct sk_buff *be_insert_vlan_i
                        skb->vlan_tci = 0;
        }
  
 -              skb = __vlan_put_tag(skb, vlan_tag);
+       if (qnq_async_evt_rcvd(adapter) && adapter->pvid) {
+               if (!vlan_tag)
+                       vlan_tag = adapter->pvid;
+               if (skip_hw_vlan)
+                       *skip_hw_vlan = true;
+       }
+       if (vlan_tag) {
 -              skb = __vlan_put_tag(skb, vlan_tag);
++              skb = __vlan_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);
+               if (unlikely(!skb))
+                       return skb;
+               skb->vlan_tci = 0;
+       }
+       /* Insert the outer VLAN, if any */
+       if (adapter->qnq_vid) {
+               vlan_tag = adapter->qnq_vid;
++              skb = __vlan_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);
+               if (unlikely(!skb))
+                       return skb;
+               if (skip_hw_vlan)
+                       *skip_hw_vlan = true;
+       }
        return skb;
  }
  
Simple merge
Simple merge
index 2f1f88923df8ca0208222b559bcffbf23870603d,7de033667ebcfdba792b9f59c96d69378ed758be..b27a4d792d1537fe2f53a492b6f3b19992e5dbc0
@@@ -1061,19 -1046,9 +1061,18 @@@ int batadv_recv_unicast_packet(struct s
        if (is4addr)
                hdr_size = sizeof(*unicast_4addr_packet);
  
 -      if (batadv_check_unicast_packet(bat_priv, skb, hdr_size) < 0)
 +      /* function returns -EREMOTE for promiscuous packets */
 +      check = batadv_check_unicast_packet(bat_priv, skb, hdr_size);
 +
 +      /* Even though the packet is not for us, we might save it to use for
 +       * decoding a later received coded packet
 +       */
 +      if (check == -EREMOTE)
 +              batadv_nc_skb_store_sniffed_unicast(bat_priv, skb);
 +
 +      if (check < 0)
                return NET_RX_DROP;
-       if (!batadv_check_unicast_ttvn(bat_priv, skb))
+       if (!batadv_check_unicast_ttvn(bat_priv, skb, hdr_size))
                return NET_RX_DROP;
  
        /* packet for me */
Simple merge
index 8ea9751645968d075e3808b22c86c02c016d0094,d09203c63264d2d8c11f7b40d42200f82934213b..d979657b8a122fe869c807f8d3e796651f668781
@@@ -1909,50 -1950,6 +1909,51 @@@ void tcp_v4_early_demux(struct sk_buff 
        }
  }
  
 +/* Packet is added to VJ-style prequeue for processing in process
 + * context, if a reader task is waiting. Apparently, this exciting
 + * idea (VJ's mail "Re: query about TCP header on tcp-ip" of 07 Sep 93)
 + * failed somewhere. Latency? Burstiness? Well, at least now we will
 + * see, why it failed. 8)8)                             --ANK
 + *
 + */
 +bool tcp_prequeue(struct sock *sk, struct sk_buff *skb)
 +{
 +      struct tcp_sock *tp = tcp_sk(sk);
 +
 +      if (sysctl_tcp_low_latency || !tp->ucopy.task)
 +              return false;
 +
 +      if (skb->len <= tcp_hdrlen(skb) &&
 +          skb_queue_len(&tp->ucopy.prequeue) == 0)
 +              return false;
 +
++      skb_dst_force(skb);
 +      __skb_queue_tail(&tp->ucopy.prequeue, skb);
 +      tp->ucopy.memory += skb->truesize;
 +      if (tp->ucopy.memory > sk->sk_rcvbuf) {
 +              struct sk_buff *skb1;
 +
 +              BUG_ON(sock_owned_by_user(sk));
 +
 +              while ((skb1 = __skb_dequeue(&tp->ucopy.prequeue)) != NULL) {
 +                      sk_backlog_rcv(sk, skb1);
 +                      NET_INC_STATS_BH(sock_net(sk),
 +                                       LINUX_MIB_TCPPREQUEUEDROPPED);
 +              }
 +
 +              tp->ucopy.memory = 0;
 +      } else if (skb_queue_len(&tp->ucopy.prequeue) == 1) {
 +              wake_up_interruptible_sync_poll(sk_sleep(sk),
 +                                         POLLIN | POLLRDNORM | POLLRDBAND);
 +              if (!inet_csk_ack_scheduled(sk))
 +                      inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK,
 +                                                (3 * tcp_rto_min(sk)) / 4,
 +                                                TCP_RTO_MAX);
 +      }
 +      return true;
 +}
 +EXPORT_SYMBOL(tcp_prequeue);
 +
  /*
   *    From tcp_input.c
   */
index 5c9e021994ba89243dd3356dd0e454659d3f85a5,703c1210d2230760f00629cd7302d2909713f235..d48422e271109a47d2e7139cf33e2bc727c38f3d
@@@ -88,7 -88,9 +88,7 @@@ struct mac802154_sub_if_data 
  
  #define mac802154_to_priv(_hw)        container_of(_hw, struct mac802154_priv, hw)
  
- #define MAC802154_CHAN_NONE           (~(u8)0) /* No channel is assigned */
 -#define MAC802154_MAX_XMIT_ATTEMPTS   3
 -
+ #define MAC802154_CHAN_NONE           0xff /* No channel is assigned */
  
  extern struct ieee802154_reduced_mlme_ops mac802154_mlme_reduced;
  extern struct ieee802154_mlme_ops mac802154_mlme_wpan;
Simple merge
index 38f08c31cdd878dea45df5dd8d01d2c21d90911f,0000000000000000000000000000000000000000..380253eccb74a87c3ca01f98daacd79c0a9deeea
mode 100644,000000..100644
--- /dev/null
@@@ -1,1029 -1,0 +1,1030 @@@
-       uaddr->sa_family = AF_NFC;
 +/*
 + * Copyright (C) 2011  Intel Corporation. All rights reserved.
 + *
 + * 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.
 + */
 +
 +#define pr_fmt(fmt) "llcp: %s: " fmt, __func__
 +
 +#include <linux/init.h>
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/nfc.h>
 +
 +#include "nfc.h"
 +#include "llcp.h"
 +
 +static int sock_wait_state(struct sock *sk, int state, unsigned long timeo)
 +{
 +      DECLARE_WAITQUEUE(wait, current);
 +      int err = 0;
 +
 +      pr_debug("sk %p", sk);
 +
 +      add_wait_queue(sk_sleep(sk), &wait);
 +      set_current_state(TASK_INTERRUPTIBLE);
 +
 +      while (sk->sk_state != state) {
 +              if (!timeo) {
 +                      err = -EINPROGRESS;
 +                      break;
 +              }
 +
 +              if (signal_pending(current)) {
 +                      err = sock_intr_errno(timeo);
 +                      break;
 +              }
 +
 +              release_sock(sk);
 +              timeo = schedule_timeout(timeo);
 +              lock_sock(sk);
 +              set_current_state(TASK_INTERRUPTIBLE);
 +
 +              err = sock_error(sk);
 +              if (err)
 +                      break;
 +      }
 +
 +      __set_current_state(TASK_RUNNING);
 +      remove_wait_queue(sk_sleep(sk), &wait);
 +      return err;
 +}
 +
 +static struct proto llcp_sock_proto = {
 +      .name     = "NFC_LLCP",
 +      .owner    = THIS_MODULE,
 +      .obj_size = sizeof(struct nfc_llcp_sock),
 +};
 +
 +static int llcp_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
 +{
 +      struct sock *sk = sock->sk;
 +      struct nfc_llcp_sock *llcp_sock = nfc_llcp_sock(sk);
 +      struct nfc_llcp_local *local;
 +      struct nfc_dev *dev;
 +      struct sockaddr_nfc_llcp llcp_addr;
 +      int len, ret = 0;
 +
 +      if (!addr || addr->sa_family != AF_NFC)
 +              return -EINVAL;
 +
 +      pr_debug("sk %p addr %p family %d\n", sk, addr, addr->sa_family);
 +
 +      memset(&llcp_addr, 0, sizeof(llcp_addr));
 +      len = min_t(unsigned int, sizeof(llcp_addr), alen);
 +      memcpy(&llcp_addr, addr, len);
 +
 +      /* This is going to be a listening socket, dsap must be 0 */
 +      if (llcp_addr.dsap != 0)
 +              return -EINVAL;
 +
 +      lock_sock(sk);
 +
 +      if (sk->sk_state != LLCP_CLOSED) {
 +              ret = -EBADFD;
 +              goto error;
 +      }
 +
 +      dev = nfc_get_device(llcp_addr.dev_idx);
 +      if (dev == NULL) {
 +              ret = -ENODEV;
 +              goto error;
 +      }
 +
 +      local = nfc_llcp_find_local(dev);
 +      if (local == NULL) {
 +              ret = -ENODEV;
 +              goto put_dev;
 +      }
 +
 +      llcp_sock->dev = dev;
 +      llcp_sock->local = nfc_llcp_local_get(local);
 +      llcp_sock->nfc_protocol = llcp_addr.nfc_protocol;
 +      llcp_sock->service_name_len = min_t(unsigned int,
 +                                          llcp_addr.service_name_len,
 +                                          NFC_LLCP_MAX_SERVICE_NAME);
 +      llcp_sock->service_name = kmemdup(llcp_addr.service_name,
 +                                        llcp_sock->service_name_len,
 +                                        GFP_KERNEL);
 +
 +      llcp_sock->ssap = nfc_llcp_get_sdp_ssap(local, llcp_sock);
 +      if (llcp_sock->ssap == LLCP_SAP_MAX) {
 +              ret = -EADDRINUSE;
 +              goto put_dev;
 +      }
 +
 +      llcp_sock->reserved_ssap = llcp_sock->ssap;
 +
 +      nfc_llcp_sock_link(&local->sockets, sk);
 +
 +      pr_debug("Socket bound to SAP %d\n", llcp_sock->ssap);
 +
 +      sk->sk_state = LLCP_BOUND;
 +
 +put_dev:
 +      nfc_put_device(dev);
 +
 +error:
 +      release_sock(sk);
 +      return ret;
 +}
 +
 +static int llcp_raw_sock_bind(struct socket *sock, struct sockaddr *addr,
 +                            int alen)
 +{
 +      struct sock *sk = sock->sk;
 +      struct nfc_llcp_sock *llcp_sock = nfc_llcp_sock(sk);
 +      struct nfc_llcp_local *local;
 +      struct nfc_dev *dev;
 +      struct sockaddr_nfc_llcp llcp_addr;
 +      int len, ret = 0;
 +
 +      if (!addr || addr->sa_family != AF_NFC)
 +              return -EINVAL;
 +
 +      pr_debug("sk %p addr %p family %d\n", sk, addr, addr->sa_family);
 +
 +      memset(&llcp_addr, 0, sizeof(llcp_addr));
 +      len = min_t(unsigned int, sizeof(llcp_addr), alen);
 +      memcpy(&llcp_addr, addr, len);
 +
 +      lock_sock(sk);
 +
 +      if (sk->sk_state != LLCP_CLOSED) {
 +              ret = -EBADFD;
 +              goto error;
 +      }
 +
 +      dev = nfc_get_device(llcp_addr.dev_idx);
 +      if (dev == NULL) {
 +              ret = -ENODEV;
 +              goto error;
 +      }
 +
 +      local = nfc_llcp_find_local(dev);
 +      if (local == NULL) {
 +              ret = -ENODEV;
 +              goto put_dev;
 +      }
 +
 +      llcp_sock->dev = dev;
 +      llcp_sock->local = nfc_llcp_local_get(local);
 +      llcp_sock->nfc_protocol = llcp_addr.nfc_protocol;
 +
 +      nfc_llcp_sock_link(&local->raw_sockets, sk);
 +
 +      sk->sk_state = LLCP_BOUND;
 +
 +put_dev:
 +      nfc_put_device(dev);
 +
 +error:
 +      release_sock(sk);
 +      return ret;
 +}
 +
 +static int llcp_sock_listen(struct socket *sock, int backlog)
 +{
 +      struct sock *sk = sock->sk;
 +      int ret = 0;
 +
 +      pr_debug("sk %p backlog %d\n", sk, backlog);
 +
 +      lock_sock(sk);
 +
 +      if ((sock->type != SOCK_SEQPACKET && sock->type != SOCK_STREAM) ||
 +          sk->sk_state != LLCP_BOUND) {
 +              ret = -EBADFD;
 +              goto error;
 +      }
 +
 +      sk->sk_max_ack_backlog = backlog;
 +      sk->sk_ack_backlog = 0;
 +
 +      pr_debug("Socket listening\n");
 +      sk->sk_state = LLCP_LISTEN;
 +
 +error:
 +      release_sock(sk);
 +
 +      return ret;
 +}
 +
 +static int nfc_llcp_setsockopt(struct socket *sock, int level, int optname,
 +                             char __user *optval, unsigned int optlen)
 +{
 +      struct sock *sk = sock->sk;
 +      struct nfc_llcp_sock *llcp_sock = nfc_llcp_sock(sk);
 +      u32 opt;
 +      int err = 0;
 +
 +      pr_debug("%p optname %d\n", sk, optname);
 +
 +      if (level != SOL_NFC)
 +              return -ENOPROTOOPT;
 +
 +      lock_sock(sk);
 +
 +      switch (optname) {
 +      case NFC_LLCP_RW:
 +              if (sk->sk_state == LLCP_CONNECTED ||
 +                  sk->sk_state == LLCP_BOUND ||
 +                  sk->sk_state == LLCP_LISTEN) {
 +                      err = -EINVAL;
 +                      break;
 +              }
 +
 +              if (get_user(opt, (u32 __user *) optval)) {
 +                      err = -EFAULT;
 +                      break;
 +              }
 +
 +              if (opt > LLCP_MAX_RW) {
 +                      err = -EINVAL;
 +                      break;
 +              }
 +
 +              llcp_sock->rw = (u8) opt;
 +
 +              break;
 +
 +      case NFC_LLCP_MIUX:
 +              if (sk->sk_state == LLCP_CONNECTED ||
 +                  sk->sk_state == LLCP_BOUND ||
 +                  sk->sk_state == LLCP_LISTEN) {
 +                      err = -EINVAL;
 +                      break;
 +              }
 +
 +              if (get_user(opt, (u32 __user *) optval)) {
 +                      err = -EFAULT;
 +                      break;
 +              }
 +
 +              if (opt > LLCP_MAX_MIUX) {
 +                      err = -EINVAL;
 +                      break;
 +              }
 +
 +              llcp_sock->miux = cpu_to_be16((u16) opt);
 +
 +              break;
 +
 +      default:
 +              err = -ENOPROTOOPT;
 +              break;
 +      }
 +
 +      release_sock(sk);
 +
 +      pr_debug("%p rw %d miux %d\n", llcp_sock,
 +               llcp_sock->rw, llcp_sock->miux);
 +
 +      return err;
 +}
 +
 +static int nfc_llcp_getsockopt(struct socket *sock, int level, int optname,
 +                             char __user *optval, int __user *optlen)
 +{
 +      struct nfc_llcp_local *local;
 +      struct sock *sk = sock->sk;
 +      struct nfc_llcp_sock *llcp_sock = nfc_llcp_sock(sk);
 +      int len, err = 0;
 +      u16 miux, remote_miu;
 +      u8 rw;
 +
 +      pr_debug("%p optname %d\n", sk, optname);
 +
 +      if (level != SOL_NFC)
 +              return -ENOPROTOOPT;
 +
 +      if (get_user(len, optlen))
 +              return -EFAULT;
 +
 +      local = llcp_sock->local;
 +      if (!local)
 +              return -ENODEV;
 +
 +      len = min_t(u32, len, sizeof(u32));
 +
 +      lock_sock(sk);
 +
 +      switch (optname) {
 +      case NFC_LLCP_RW:
 +              rw = llcp_sock->rw > LLCP_MAX_RW ? local->rw : llcp_sock->rw;
 +              if (put_user(rw, (u32 __user *) optval))
 +                      err = -EFAULT;
 +
 +              break;
 +
 +      case NFC_LLCP_MIUX:
 +              miux = be16_to_cpu(llcp_sock->miux) > LLCP_MAX_MIUX ?
 +                      be16_to_cpu(local->miux) : be16_to_cpu(llcp_sock->miux);
 +
 +              if (put_user(miux, (u32 __user *) optval))
 +                      err = -EFAULT;
 +
 +              break;
 +
 +      case NFC_LLCP_REMOTE_MIU:
 +              remote_miu = llcp_sock->remote_miu > LLCP_MAX_MIU ?
 +                              local->remote_miu : llcp_sock->remote_miu;
 +
 +              if (put_user(remote_miu, (u32 __user *) optval))
 +                      err = -EFAULT;
 +
 +              break;
 +
 +      case NFC_LLCP_REMOTE_LTO:
 +              if (put_user(local->remote_lto / 10, (u32 __user *) optval))
 +                      err = -EFAULT;
 +
 +              break;
 +
 +      case NFC_LLCP_REMOTE_RW:
 +              if (put_user(llcp_sock->remote_rw, (u32 __user *) optval))
 +                      err = -EFAULT;
 +
 +              break;
 +
 +      default:
 +              err = -ENOPROTOOPT;
 +              break;
 +      }
 +
 +      release_sock(sk);
 +
 +      if (put_user(len, optlen))
 +              return -EFAULT;
 +
 +      return err;
 +}
 +
 +void nfc_llcp_accept_unlink(struct sock *sk)
 +{
 +      struct nfc_llcp_sock *llcp_sock = nfc_llcp_sock(sk);
 +
 +      pr_debug("state %d\n", sk->sk_state);
 +
 +      list_del_init(&llcp_sock->accept_queue);
 +      sk_acceptq_removed(llcp_sock->parent);
 +      llcp_sock->parent = NULL;
 +
 +      sock_put(sk);
 +}
 +
 +void nfc_llcp_accept_enqueue(struct sock *parent, struct sock *sk)
 +{
 +      struct nfc_llcp_sock *llcp_sock = nfc_llcp_sock(sk);
 +      struct nfc_llcp_sock *llcp_sock_parent = nfc_llcp_sock(parent);
 +
 +      /* Lock will be free from unlink */
 +      sock_hold(sk);
 +
 +      list_add_tail(&llcp_sock->accept_queue,
 +                    &llcp_sock_parent->accept_queue);
 +      llcp_sock->parent = parent;
 +      sk_acceptq_added(parent);
 +}
 +
 +struct sock *nfc_llcp_accept_dequeue(struct sock *parent,
 +                                   struct socket *newsock)
 +{
 +      struct nfc_llcp_sock *lsk, *n, *llcp_parent;
 +      struct sock *sk;
 +
 +      llcp_parent = nfc_llcp_sock(parent);
 +
 +      list_for_each_entry_safe(lsk, n, &llcp_parent->accept_queue,
 +                               accept_queue) {
 +              sk = &lsk->sk;
 +              lock_sock(sk);
 +
 +              if (sk->sk_state == LLCP_CLOSED) {
 +                      release_sock(sk);
 +                      nfc_llcp_accept_unlink(sk);
 +                      continue;
 +              }
 +
 +              if (sk->sk_state == LLCP_CONNECTED || !newsock) {
 +                      list_del_init(&lsk->accept_queue);
 +                      sock_put(sk);
 +
 +                      if (newsock)
 +                              sock_graft(sk, newsock);
 +
 +                      release_sock(sk);
 +
 +                      pr_debug("Returning sk state %d\n", sk->sk_state);
 +
 +                      sk_acceptq_removed(parent);
 +
 +                      return sk;
 +              }
 +
 +              release_sock(sk);
 +      }
 +
 +      return NULL;
 +}
 +
 +static int llcp_sock_accept(struct socket *sock, struct socket *newsock,
 +                          int flags)
 +{
 +      DECLARE_WAITQUEUE(wait, current);
 +      struct sock *sk = sock->sk, *new_sk;
 +      long timeo;
 +      int ret = 0;
 +
 +      pr_debug("parent %p\n", sk);
 +
 +      lock_sock_nested(sk, SINGLE_DEPTH_NESTING);
 +
 +      if (sk->sk_state != LLCP_LISTEN) {
 +              ret = -EBADFD;
 +              goto error;
 +      }
 +
 +      timeo = sock_rcvtimeo(sk, flags & O_NONBLOCK);
 +
 +      /* Wait for an incoming connection. */
 +      add_wait_queue_exclusive(sk_sleep(sk), &wait);
 +      while (!(new_sk = nfc_llcp_accept_dequeue(sk, newsock))) {
 +              set_current_state(TASK_INTERRUPTIBLE);
 +
 +              if (!timeo) {
 +                      ret = -EAGAIN;
 +                      break;
 +              }
 +
 +              if (signal_pending(current)) {
 +                      ret = sock_intr_errno(timeo);
 +                      break;
 +              }
 +
 +              release_sock(sk);
 +              timeo = schedule_timeout(timeo);
 +              lock_sock_nested(sk, SINGLE_DEPTH_NESTING);
 +      }
 +      __set_current_state(TASK_RUNNING);
 +      remove_wait_queue(sk_sleep(sk), &wait);
 +
 +      if (ret)
 +              goto error;
 +
 +      newsock->state = SS_CONNECTED;
 +
 +      pr_debug("new socket %p\n", new_sk);
 +
 +error:
 +      release_sock(sk);
 +
 +      return ret;
 +}
 +
 +static int llcp_sock_getname(struct socket *sock, struct sockaddr *uaddr,
 +                           int *len, int peer)
 +{
 +      struct sock *sk = sock->sk;
 +      struct nfc_llcp_sock *llcp_sock = nfc_llcp_sock(sk);
 +      DECLARE_SOCKADDR(struct sockaddr_nfc_llcp *, llcp_addr, uaddr);
 +
 +      if (llcp_sock == NULL || llcp_sock->dev == NULL)
 +              return -EBADFD;
 +
 +      pr_debug("%p %d %d %d\n", sk, llcp_sock->target_idx,
 +               llcp_sock->dsap, llcp_sock->ssap);
 +
++      memset(llcp_addr, 0, sizeof(*llcp_addr));
 +      *len = sizeof(struct sockaddr_nfc_llcp);
 +
++      llcp_addr->sa_family = AF_NFC;
 +      llcp_addr->dev_idx = llcp_sock->dev->idx;
 +      llcp_addr->target_idx = llcp_sock->target_idx;
++      llcp_addr->nfc_protocol = llcp_sock->nfc_protocol;
 +      llcp_addr->dsap = llcp_sock->dsap;
 +      llcp_addr->ssap = llcp_sock->ssap;
 +      llcp_addr->service_name_len = llcp_sock->service_name_len;
 +      memcpy(llcp_addr->service_name, llcp_sock->service_name,
 +             llcp_addr->service_name_len);
 +
 +      return 0;
 +}
 +
 +static inline unsigned int llcp_accept_poll(struct sock *parent)
 +{
 +      struct nfc_llcp_sock *llcp_sock, *n, *parent_sock;
 +      struct sock *sk;
 +
 +      parent_sock = nfc_llcp_sock(parent);
 +
 +      list_for_each_entry_safe(llcp_sock, n, &parent_sock->accept_queue,
 +                               accept_queue) {
 +              sk = &llcp_sock->sk;
 +
 +              if (sk->sk_state == LLCP_CONNECTED)
 +                      return POLLIN | POLLRDNORM;
 +      }
 +
 +      return 0;
 +}
 +
 +static unsigned int llcp_sock_poll(struct file *file, struct socket *sock,
 +                                 poll_table *wait)
 +{
 +      struct sock *sk = sock->sk;
 +      unsigned int mask = 0;
 +
 +      pr_debug("%p\n", sk);
 +
 +      sock_poll_wait(file, sk_sleep(sk), wait);
 +
 +      if (sk->sk_state == LLCP_LISTEN)
 +              return llcp_accept_poll(sk);
 +
 +      if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
 +              mask |= POLLERR |
 +                      (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0);
 +
 +      if (!skb_queue_empty(&sk->sk_receive_queue))
 +              mask |= POLLIN | POLLRDNORM;
 +
 +      if (sk->sk_state == LLCP_CLOSED)
 +              mask |= POLLHUP;
 +
 +      if (sk->sk_shutdown & RCV_SHUTDOWN)
 +              mask |= POLLRDHUP | POLLIN | POLLRDNORM;
 +
 +      if (sk->sk_shutdown == SHUTDOWN_MASK)
 +              mask |= POLLHUP;
 +
 +      if (sock_writeable(sk))
 +              mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
 +      else
 +              set_bit(SOCK_ASYNC_NOSPACE, &sk->sk_socket->flags);
 +
 +      pr_debug("mask 0x%x\n", mask);
 +
 +      return mask;
 +}
 +
 +static int llcp_sock_release(struct socket *sock)
 +{
 +      struct sock *sk = sock->sk;
 +      struct nfc_llcp_local *local;
 +      struct nfc_llcp_sock *llcp_sock = nfc_llcp_sock(sk);
 +      int err = 0;
 +
 +      if (!sk)
 +              return 0;
 +
 +      pr_debug("%p\n", sk);
 +
 +      local = llcp_sock->local;
 +      if (local == NULL) {
 +              err = -ENODEV;
 +              goto out;
 +      }
 +
 +      lock_sock(sk);
 +
 +      /* Send a DISC */
 +      if (sk->sk_state == LLCP_CONNECTED)
 +              nfc_llcp_disconnect(llcp_sock);
 +
 +      if (sk->sk_state == LLCP_LISTEN) {
 +              struct nfc_llcp_sock *lsk, *n;
 +              struct sock *accept_sk;
 +
 +              list_for_each_entry_safe(lsk, n, &llcp_sock->accept_queue,
 +                                       accept_queue) {
 +                      accept_sk = &lsk->sk;
 +                      lock_sock(accept_sk);
 +
 +                      nfc_llcp_disconnect(lsk);
 +                      nfc_llcp_accept_unlink(accept_sk);
 +
 +                      release_sock(accept_sk);
 +              }
 +      }
 +
 +      if (llcp_sock->reserved_ssap < LLCP_SAP_MAX)
 +              nfc_llcp_put_ssap(llcp_sock->local, llcp_sock->ssap);
 +
 +      release_sock(sk);
 +
 +      if (sock->type == SOCK_RAW)
 +              nfc_llcp_sock_unlink(&local->raw_sockets, sk);
 +      else
 +              nfc_llcp_sock_unlink(&local->sockets, sk);
 +
 +out:
 +      sock_orphan(sk);
 +      sock_put(sk);
 +
 +      return err;
 +}
 +
 +static int llcp_sock_connect(struct socket *sock, struct sockaddr *_addr,
 +                           int len, int flags)
 +{
 +      struct sock *sk = sock->sk;
 +      struct nfc_llcp_sock *llcp_sock = nfc_llcp_sock(sk);
 +      struct sockaddr_nfc_llcp *addr = (struct sockaddr_nfc_llcp *)_addr;
 +      struct nfc_dev *dev;
 +      struct nfc_llcp_local *local;
 +      int ret = 0;
 +
 +      pr_debug("sock %p sk %p flags 0x%x\n", sock, sk, flags);
 +
 +      if (!addr || len < sizeof(struct sockaddr_nfc) ||
 +          addr->sa_family != AF_NFC)
 +              return -EINVAL;
 +
 +      if (addr->service_name_len == 0 && addr->dsap == 0)
 +              return -EINVAL;
 +
 +      pr_debug("addr dev_idx=%u target_idx=%u protocol=%u\n", addr->dev_idx,
 +               addr->target_idx, addr->nfc_protocol);
 +
 +      lock_sock(sk);
 +
 +      if (sk->sk_state == LLCP_CONNECTED) {
 +              ret = -EISCONN;
 +              goto error;
 +      }
 +
 +      dev = nfc_get_device(addr->dev_idx);
 +      if (dev == NULL) {
 +              ret = -ENODEV;
 +              goto error;
 +      }
 +
 +      local = nfc_llcp_find_local(dev);
 +      if (local == NULL) {
 +              ret = -ENODEV;
 +              goto put_dev;
 +      }
 +
 +      device_lock(&dev->dev);
 +      if (dev->dep_link_up == false) {
 +              ret = -ENOLINK;
 +              device_unlock(&dev->dev);
 +              goto put_dev;
 +      }
 +      device_unlock(&dev->dev);
 +
 +      if (local->rf_mode == NFC_RF_INITIATOR &&
 +          addr->target_idx != local->target_idx) {
 +              ret = -ENOLINK;
 +              goto put_dev;
 +      }
 +
 +      llcp_sock->dev = dev;
 +      llcp_sock->local = nfc_llcp_local_get(local);
 +      llcp_sock->remote_miu = llcp_sock->local->remote_miu;
 +      llcp_sock->ssap = nfc_llcp_get_local_ssap(local);
 +      if (llcp_sock->ssap == LLCP_SAP_MAX) {
 +              ret = -ENOMEM;
 +              goto put_dev;
 +      }
 +
 +      llcp_sock->reserved_ssap = llcp_sock->ssap;
 +
 +      if (addr->service_name_len == 0)
 +              llcp_sock->dsap = addr->dsap;
 +      else
 +              llcp_sock->dsap = LLCP_SAP_SDP;
 +      llcp_sock->nfc_protocol = addr->nfc_protocol;
 +      llcp_sock->service_name_len = min_t(unsigned int,
 +                                          addr->service_name_len,
 +                                          NFC_LLCP_MAX_SERVICE_NAME);
 +      llcp_sock->service_name = kmemdup(addr->service_name,
 +                                        llcp_sock->service_name_len,
 +                                        GFP_KERNEL);
 +
 +      nfc_llcp_sock_link(&local->connecting_sockets, sk);
 +
 +      ret = nfc_llcp_send_connect(llcp_sock);
 +      if (ret)
 +              goto sock_unlink;
 +
 +      ret = sock_wait_state(sk, LLCP_CONNECTED,
 +                            sock_sndtimeo(sk, flags & O_NONBLOCK));
 +      if (ret)
 +              goto sock_unlink;
 +
 +      release_sock(sk);
 +
 +      return 0;
 +
 +sock_unlink:
 +      nfc_llcp_put_ssap(local, llcp_sock->ssap);
 +
 +      nfc_llcp_sock_unlink(&local->connecting_sockets, sk);
 +
 +put_dev:
 +      nfc_put_device(dev);
 +
 +error:
 +      release_sock(sk);
 +      return ret;
 +}
 +
 +static int llcp_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
 +                           struct msghdr *msg, size_t len)
 +{
 +      struct sock *sk = sock->sk;
 +      struct nfc_llcp_sock *llcp_sock = nfc_llcp_sock(sk);
 +      int ret;
 +
 +      pr_debug("sock %p sk %p", sock, sk);
 +
 +      ret = sock_error(sk);
 +      if (ret)
 +              return ret;
 +
 +      if (msg->msg_flags & MSG_OOB)
 +              return -EOPNOTSUPP;
 +
 +      lock_sock(sk);
 +
 +      if (sk->sk_type == SOCK_DGRAM) {
 +              struct sockaddr_nfc_llcp *addr =
 +                      (struct sockaddr_nfc_llcp *)msg->msg_name;
 +
 +              if (msg->msg_namelen < sizeof(*addr)) {
 +                      release_sock(sk);
 +                      return -EINVAL;
 +              }
 +
 +              release_sock(sk);
 +
 +              return nfc_llcp_send_ui_frame(llcp_sock, addr->dsap, addr->ssap,
 +                                            msg, len);
 +      }
 +
 +      if (sk->sk_state != LLCP_CONNECTED) {
 +              release_sock(sk);
 +              return -ENOTCONN;
 +      }
 +
 +      release_sock(sk);
 +
 +      return nfc_llcp_send_i_frame(llcp_sock, msg, len);
 +}
 +
 +static int llcp_sock_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;
 +      unsigned int copied, rlen;
 +      struct sk_buff *skb, *cskb;
 +      int err = 0;
 +
 +      pr_debug("%p %zu\n", sk, len);
 +
 +      msg->msg_namelen = 0;
 +
 +      lock_sock(sk);
 +
 +      if (sk->sk_state == LLCP_CLOSED &&
 +          skb_queue_empty(&sk->sk_receive_queue)) {
 +              release_sock(sk);
 +              return 0;
 +      }
 +
 +      release_sock(sk);
 +
 +      if (flags & (MSG_OOB))
 +              return -EOPNOTSUPP;
 +
 +      skb = skb_recv_datagram(sk, flags, noblock, &err);
 +      if (!skb) {
 +              pr_err("Recv datagram failed state %d %d %d",
 +                     sk->sk_state, err, sock_error(sk));
 +
 +              if (sk->sk_shutdown & RCV_SHUTDOWN)
 +                      return 0;
 +
 +              return err;
 +      }
 +
 +      rlen = skb->len;                /* real length of skb */
 +      copied = min_t(unsigned int, rlen, len);
 +
 +      cskb = skb;
 +      if (skb_copy_datagram_iovec(cskb, 0, msg->msg_iov, copied)) {
 +              if (!(flags & MSG_PEEK))
 +                      skb_queue_head(&sk->sk_receive_queue, skb);
 +              return -EFAULT;
 +      }
 +
 +      sock_recv_timestamp(msg, sk, skb);
 +
 +      if (sk->sk_type == SOCK_DGRAM && msg->msg_name) {
 +              struct nfc_llcp_ui_cb *ui_cb = nfc_llcp_ui_skb_cb(skb);
 +              struct sockaddr_nfc_llcp *sockaddr =
 +                      (struct sockaddr_nfc_llcp *) msg->msg_name;
 +
 +              msg->msg_namelen = sizeof(struct sockaddr_nfc_llcp);
 +
 +              pr_debug("Datagram socket %d %d\n", ui_cb->dsap, ui_cb->ssap);
 +
 +              memset(sockaddr, 0, sizeof(*sockaddr));
 +              sockaddr->sa_family = AF_NFC;
 +              sockaddr->nfc_protocol = NFC_PROTO_NFC_DEP;
 +              sockaddr->dsap = ui_cb->dsap;
 +              sockaddr->ssap = ui_cb->ssap;
 +      }
 +
 +      /* Mark read part of skb as used */
 +      if (!(flags & MSG_PEEK)) {
 +
 +              /* SOCK_STREAM: re-queue skb if it contains unreceived data */
 +              if (sk->sk_type == SOCK_STREAM ||
 +                  sk->sk_type == SOCK_DGRAM ||
 +                  sk->sk_type == SOCK_RAW) {
 +                      skb_pull(skb, copied);
 +                      if (skb->len) {
 +                              skb_queue_head(&sk->sk_receive_queue, skb);
 +                              goto done;
 +                      }
 +              }
 +
 +              kfree_skb(skb);
 +      }
 +
 +      /* XXX Queue backlogged skbs */
 +
 +done:
 +      /* SOCK_SEQPACKET: return real length if MSG_TRUNC is set */
 +      if (sk->sk_type == SOCK_SEQPACKET && (flags & MSG_TRUNC))
 +              copied = rlen;
 +
 +      return copied;
 +}
 +
 +static const struct proto_ops llcp_sock_ops = {
 +      .family         = PF_NFC,
 +      .owner          = THIS_MODULE,
 +      .bind           = llcp_sock_bind,
 +      .connect        = llcp_sock_connect,
 +      .release        = llcp_sock_release,
 +      .socketpair     = sock_no_socketpair,
 +      .accept         = llcp_sock_accept,
 +      .getname        = llcp_sock_getname,
 +      .poll           = llcp_sock_poll,
 +      .ioctl          = sock_no_ioctl,
 +      .listen         = llcp_sock_listen,
 +      .shutdown       = sock_no_shutdown,
 +      .setsockopt     = nfc_llcp_setsockopt,
 +      .getsockopt     = nfc_llcp_getsockopt,
 +      .sendmsg        = llcp_sock_sendmsg,
 +      .recvmsg        = llcp_sock_recvmsg,
 +      .mmap           = sock_no_mmap,
 +};
 +
 +static const struct proto_ops llcp_rawsock_ops = {
 +      .family         = PF_NFC,
 +      .owner          = THIS_MODULE,
 +      .bind           = llcp_raw_sock_bind,
 +      .connect        = sock_no_connect,
 +      .release        = llcp_sock_release,
 +      .socketpair     = sock_no_socketpair,
 +      .accept         = sock_no_accept,
 +      .getname        = llcp_sock_getname,
 +      .poll           = llcp_sock_poll,
 +      .ioctl          = sock_no_ioctl,
 +      .listen         = sock_no_listen,
 +      .shutdown       = sock_no_shutdown,
 +      .setsockopt     = sock_no_setsockopt,
 +      .getsockopt     = sock_no_getsockopt,
 +      .sendmsg        = sock_no_sendmsg,
 +      .recvmsg        = llcp_sock_recvmsg,
 +      .mmap           = sock_no_mmap,
 +};
 +
 +static void llcp_sock_destruct(struct sock *sk)
 +{
 +      struct nfc_llcp_sock *llcp_sock = nfc_llcp_sock(sk);
 +
 +      pr_debug("%p\n", sk);
 +
 +      if (sk->sk_state == LLCP_CONNECTED)
 +              nfc_put_device(llcp_sock->dev);
 +
 +      skb_queue_purge(&sk->sk_receive_queue);
 +
 +      nfc_llcp_sock_free(llcp_sock);
 +
 +      if (!sock_flag(sk, SOCK_DEAD)) {
 +              pr_err("Freeing alive NFC LLCP socket %p\n", sk);
 +              return;
 +      }
 +}
 +
 +struct sock *nfc_llcp_sock_alloc(struct socket *sock, int type, gfp_t gfp)
 +{
 +      struct sock *sk;
 +      struct nfc_llcp_sock *llcp_sock;
 +
 +      sk = sk_alloc(&init_net, PF_NFC, gfp, &llcp_sock_proto);
 +      if (!sk)
 +              return NULL;
 +
 +      llcp_sock = nfc_llcp_sock(sk);
 +
 +      sock_init_data(sock, sk);
 +      sk->sk_state = LLCP_CLOSED;
 +      sk->sk_protocol = NFC_SOCKPROTO_LLCP;
 +      sk->sk_type = type;
 +      sk->sk_destruct = llcp_sock_destruct;
 +
 +      llcp_sock->ssap = 0;
 +      llcp_sock->dsap = LLCP_SAP_SDP;
 +      llcp_sock->rw = LLCP_MAX_RW + 1;
 +      llcp_sock->miux = cpu_to_be16(LLCP_MAX_MIUX + 1);
 +      llcp_sock->send_n = llcp_sock->send_ack_n = 0;
 +      llcp_sock->recv_n = llcp_sock->recv_ack_n = 0;
 +      llcp_sock->remote_ready = 1;
 +      llcp_sock->reserved_ssap = LLCP_SAP_MAX;
 +      nfc_llcp_socket_remote_param_init(llcp_sock);
 +      skb_queue_head_init(&llcp_sock->tx_queue);
 +      skb_queue_head_init(&llcp_sock->tx_pending_queue);
 +      INIT_LIST_HEAD(&llcp_sock->accept_queue);
 +
 +      if (sock != NULL)
 +              sock->state = SS_UNCONNECTED;
 +
 +      return sk;
 +}
 +
 +void nfc_llcp_sock_free(struct nfc_llcp_sock *sock)
 +{
 +      kfree(sock->service_name);
 +
 +      skb_queue_purge(&sock->tx_queue);
 +      skb_queue_purge(&sock->tx_pending_queue);
 +
 +      list_del_init(&sock->accept_queue);
 +
 +      sock->parent = NULL;
 +
 +      nfc_llcp_local_put(sock->local);
 +}
 +
 +static int llcp_sock_create(struct net *net, struct socket *sock,
 +                          const struct nfc_protocol *nfc_proto)
 +{
 +      struct sock *sk;
 +
 +      pr_debug("%p\n", sock);
 +
 +      if (sock->type != SOCK_STREAM &&
 +          sock->type != SOCK_DGRAM &&
 +          sock->type != SOCK_RAW)
 +              return -ESOCKTNOSUPPORT;
 +
 +      if (sock->type == SOCK_RAW)
 +              sock->ops = &llcp_rawsock_ops;
 +      else
 +              sock->ops = &llcp_sock_ops;
 +
 +      sk = nfc_llcp_sock_alloc(sock, sock->type, GFP_ATOMIC);
 +      if (sk == NULL)
 +              return -ENOMEM;
 +
 +      return 0;
 +}
 +
 +static const struct nfc_protocol llcp_nfc_proto = {
 +      .id       = NFC_SOCKPROTO_LLCP,
 +      .proto    = &llcp_sock_proto,
 +      .owner    = THIS_MODULE,
 +      .create   = llcp_sock_create
 +};
 +
 +int __init nfc_llcp_sock_init(void)
 +{
 +      return nfc_proto_register(&llcp_nfc_proto);
 +}
 +
 +void nfc_llcp_sock_exit(void)
 +{
 +      nfc_proto_unregister(&llcp_nfc_proto);
 +}
Simple merge