From: David S. Miller <davem@davemloft.net>
Date: Thu, 15 Jan 2015 05:53:17 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v4.0-rc1~133^2~214
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=3f3558bb512e0762d5a4573a4aaf038d7a616e92;p=cascardo%2Flinux.git

Merge git://git./linux/kernel/git/davem/net

Conflicts:
	drivers/net/xen-netfront.c

Minor overlapping changes in xen-netfront.c, mostly to do
with some buffer management changes alongside the split
of stats into TX and RX.

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

3f3558bb512e0762d5a4573a4aaf038d7a616e92
diff --cc drivers/net/xen-netfront.c
index 01a4350eb313,d8c10764f130..7cfa6c027c0c
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@@ -518,15 -562,18 +517,15 @@@ static u16 xennet_select_queue(struct n
  
  static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
  {
 -	unsigned short id;
  	struct netfront_info *np = netdev_priv(dev);
- 	struct netfront_stats *stats = this_cpu_ptr(np->stats);
+ 	struct netfront_stats *tx_stats = this_cpu_ptr(np->tx_stats);
 -	struct xen_netif_tx_request *tx;
 -	char *data = skb->data;
 -	RING_IDX i;
 -	grant_ref_t ref;
 -	unsigned long mfn;
 +	struct xen_netif_tx_request *tx, *first_tx;
 +	unsigned int i;
  	int notify;
  	int slots;
 -	unsigned int offset = offset_in_page(data);
 -	unsigned int len = skb_headlen(skb);
 +	struct page *page;
 +	unsigned int offset;
 +	unsigned int len;
  	unsigned long flags;
  	struct netfront_queue *queue = NULL;
  	unsigned int num_queues = dev->real_num_tx_queues;