From: David S. Miller <davem@davemloft.net>
Date: Wed, 4 Mar 2015 02:16:48 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v4.1-rc1~128^2~353
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=71a83a6db6138b9d41d8a0b6b91cb59f6dc4742c;p=karo-tx-linux.git

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

Conflicts:
	drivers/net/ethernet/rocker/rocker.c

The rocker commit was two overlapping changes, one to rename
the ->vport member to ->pport, and another making the bitmask
expression use '1ULL' instead of plain '1'.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

71a83a6db6138b9d41d8a0b6b91cb59f6dc4742c
diff --cc drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 51300532ec26,6befde61c203..84feb241d60b
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@@ -1688,8 -1720,11 +1718,10 @@@ static void bcmgenet_init_tx_ring(struc
  	struct bcmgenet_tx_ring *ring = &priv->tx_rings[index];
  	u32 words_per_bd = WORDS_PER_BD(priv);
  	u32 flow_period_val = 0;
 -	unsigned int first_bd;
  
  	spin_lock_init(&ring->lock);
+ 	ring->priv = priv;
+ 	netif_napi_add(priv->dev, &ring->napi, bcmgenet_tx_poll, 64);
  	ring->index = index;
  	if (index == DESC_INDEX) {
  		ring->queue = 0;
diff --cc drivers/net/ethernet/rocker/rocker.c
index e5a15a4c4e8f,9fb6948e14c6..a5d1e6ea7d58
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@@ -1280,9 -1257,9 +1280,9 @@@ static void rocker_port_set_enable(stru
  	u64 val = rocker_read64(rocker_port->rocker, PORT_PHYS_ENABLE);
  
  	if (enable)
- 		val |= 1 << rocker_port->pport;
 -		val |= 1ULL << rocker_port->lport;
++		val |= 1ULL << rocker_port->pport;
  	else
- 		val &= ~(1 << rocker_port->pport);
 -		val &= ~(1ULL << rocker_port->lport);
++		val &= ~(1ULL << rocker_port->pport);
  	rocker_write64(rocker_port->rocker, PORT_PHYS_ENABLE, val);
  }
  
diff --cc drivers/vhost/net.c
index 633012cc9a57,2bbfc25e582c..18f05bff8826
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@@ -591,13 -591,8 +591,8 @@@ static void handle_rx(struct vhost_net 
  			 * TODO: support TSO.
  			 */
  			iov_iter_advance(&msg.msg_iter, vhost_hlen);
- 		} else {
- 			/* It'll come from socket; we'll need to patch
- 			 * ->num_buffers over if VIRTIO_NET_F_MRG_RXBUF
- 			 */
- 			iov_iter_advance(&fixup, sizeof(hdr));
  		}
 -		err = sock->ops->recvmsg(NULL, sock, &msg,
 +		err = sock->ops->recvmsg(sock, &msg,
  					 sock_len, MSG_DONTWAIT | MSG_TRUNC);
  		/* Userspace might have consumed the packet meanwhile:
  		 * it's not supposed to do this usually, but might be hard