Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (24 commits)
  bridge: Partially disable netpoll support
  tcp: fix crash in tcp_xmit_retransmit_queue
  IPv6: fix CoA check in RH2 input handler (mip6_rthdr_input())
  ibmveth: lost IRQ while closing/opening device leads to service loss
  rt2x00: Fix lockdep warning in rt2x00lib_probe_dev()
  vhost: avoid pr_err on condition guest can trigger
  ipmr: Don't leak memory if fib lookup fails.
  vhost-net: avoid flush under lock
  net: fix problem in reading sock TX queue
  net/core: neighbour update Oops
  net: skb_tx_hash() fix relative to skb_orphan_try()
  rfs: call sock_rps_record_flow() in tcp_splice_read()
  xfrm: do not assume that template resolving always returns xfrms
  hostap_pci: set dev->base_addr during probe
  axnet_cs: use spin_lock_irqsave in ax_interrupt
  dsa: Fix Kconfig dependencies.
  act_nat: not all of the ICMP packets need an IP header payload
  r8169: incorrect identifier for a 8168dp
  Phonet: fix skb leak in pipe endpoint accept()
  Bluetooth: Update sec_level/auth_type for already existing connections
  ...

diff --combined drivers/vhost/net.c
index 57a593c58cf418769537c06d4602910203f8e5e0,2f6185c845e03618ca679513aecd55bfb96c76d5..d219070fed3da07b3944ac53363673f310435f33
--- 1/drivers/vhost/net.c
--- 2/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@@ -177,8 -177,8 +177,8 @@@ static void handle_tx(struct vhost_net 
                        break;
                }
                if (err != len)
-                       pr_err("Truncated TX packet: "
-                              " len %d != %zd\n", err, len);
+                       pr_debug("Truncated TX packet: "
+                                " len %d != %zd\n", err, len);
                vhost_add_used_and_signal(&net->dev, vq, head, 0);
                total_len += len;
                if (unlikely(total_len >= VHOST_NET_WEIGHT)) {
@@@ -275,8 -275,8 +275,8 @@@ static void handle_rx(struct vhost_net 
                }
                /* TODO: Should check and handle checksum. */
                if (err > len) {
-                       pr_err("Discarded truncated rx packet: "
-                              " len %d > %zd\n", err, len);
+                       pr_debug("Discarded truncated rx packet: "
+                                " len %d > %zd\n", err, len);
                        vhost_discard_vq_desc(vq);
                        continue;
                }
@@@ -534,11 -534,16 +534,16 @@@ static long vhost_net_set_backend(struc
        rcu_assign_pointer(vq->private_data, sock);
        vhost_net_enable_vq(n, vq);
  done:
+       mutex_unlock(&vq->mutex);
+ 
        if (oldsock) {
                vhost_net_flush_vq(n, index);
                fput(oldsock->file);
        }
  
+       mutex_unlock(&n->dev.mutex);
+       return 0;
+ 
  err_vq:
        mutex_unlock(&vq->mutex);
  err:
@@@ -645,7 -650,7 +650,7 @@@ const static struct file_operations vho
  };
  
  static struct miscdevice vhost_net_misc = {
 -      VHOST_NET_MINOR,
 +      MISC_DYNAMIC_MINOR,
        "vhost-net",
        &vhost_net_fops,
  };