From: David S. Miller <davem@davemloft.net>
Date: Mon, 31 Mar 2014 20:56:43 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.15-rc1~113^2~17
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=0b70195e0c3206103be991e196c26fcf168d0334;p=karo-tx-linux.git

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

Conflicts:
	drivers/net/xen-netback/netback.c

A bug fix overlapped with changing how the netback SKB control
block is implemented.

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

0b70195e0c3206103be991e196c26fcf168d0334
diff --cc drivers/net/ieee802154/at86rf230.c
index e8004ef73bc1,fbb83d175da3..89417ac41083
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@@ -1247,8 -996,9 +1247,10 @@@ err_slp_tr
  static int at86rf230_remove(struct spi_device *spi)
  {
  	struct at86rf230_local *lp = spi_get_drvdata(spi);
 +	struct at86rf230_platform_data *pdata = spi->dev.platform_data;
  
+ 	/* mask all at86rf230 irq's */
+ 	at86rf230_write_subreg(lp, SR_IRQ_MASK, 0);
  	ieee802154_unregister_device(lp->dev);
  
  	free_irq(spi->irq, lp);
diff --cc drivers/net/xen-netback/netback.c
index cb784fe5220c,cd0bd95ccc14..ae34f5fc7fbc
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@@ -539,8 -531,13 +560,11 @@@ static void xenvif_rx_action(struct xen
  		} else
  			vif->rx_last_skb_slots = 0;
  
 -		sco = (struct skb_cb_overlay *)skb->cb;
 -
+ 		old_req_cons = vif->rx.req_cons;
 -		sco->meta_slots_used = xenvif_gop_skb(skb, &npo);
 +		XENVIF_RX_CB(skb)->meta_slots_used = xenvif_gop_skb(skb, &npo);
- 		BUG_ON(XENVIF_RX_CB(skb)->meta_slots_used > max_slots_needed);
+ 		ring_slots_used = vif->rx.req_cons - old_req_cons;
+ 
+ 		BUG_ON(ring_slots_used > max_slots_needed);
  
  		__skb_queue_tail(&rxq, skb);
  	}