From: David S. Miller <davem@davemloft.net>
Date: Mon, 27 Feb 2012 02:55:51 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: firefly_0821_release~3680^2~3338^2~175
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ff4783ce78c08d2990126ce1874250ae8e72bbd2;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	drivers/net/ethernet/sfc/rx.c

Overlapping changes in drivers/net/ethernet/sfc/rx.c, one to change
the rx_buf->is_page boolean into a set of u16 flags, and another to
adjust how ->ip_summed is initialized.

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

ff4783ce78c08d2990126ce1874250ae8e72bbd2
diff --cc drivers/net/can/sja1000/sja1000.c
index ebbcfcafe29b,192b0d118df4..5e10472371ed
--- a/drivers/net/can/sja1000/sja1000.c
+++ b/drivers/net/can/sja1000/sja1000.c
@@@ -492,9 -498,12 +497,12 @@@ irqreturn_t sja1000_interrupt(int irq, 
  	while ((isrc = priv->read_reg(priv, REG_IR)) && (n < SJA1000_MAX_IRQ)) {
  		n++;
  		status = priv->read_reg(priv, REG_SR);
+ 		/* check for absent controller due to hw unplug */
+ 		if (status == 0xFF && sja1000_is_absent(priv))
+ 			return IRQ_NONE;
  
  		if (isrc & IRQ_WUI)
 -			dev_warn(dev->dev.parent, "wakeup interrupt\n");
 +			netdev_warn(dev, "wakeup interrupt\n");
  
  		if (isrc & IRQ_TI) {
  			/* transmission complete interrupt */
diff --cc drivers/net/ethernet/sfc/rx.c
index 506d24669956,fc52fca74193..1ba290d0c21c
--- a/drivers/net/ethernet/sfc/rx.c
+++ b/drivers/net/ethernet/sfc/rx.c
@@@ -155,11 -156,10 +155,10 @@@ static int efx_init_rx_buffers_skb(stru
  		if (unlikely(!skb))
  			return -ENOMEM;
  
- 		/* Adjust the SKB for padding and checksum */
+ 		/* Adjust the SKB for padding */
  		skb_reserve(skb, NET_IP_ALIGN);
  		rx_buf->len = skb_len - NET_IP_ALIGN;
 -		rx_buf->is_page = false;
 +		rx_buf->flags = 0;
- 		skb->ip_summed = CHECKSUM_UNNECESSARY;
  
  		rx_buf->dma_addr = pci_map_single(efx->pci_dev,
  						  skb->data, rx_buf->len,
@@@ -494,8 -493,9 +493,9 @@@ static void efx_rx_packet_gro(struct ef
  	} else {
  		struct sk_buff *skb = rx_buf->u.skb;
  
 -		EFX_BUG_ON_PARANOID(!checksummed);
 +		EFX_BUG_ON_PARANOID(!(rx_buf->flags & EFX_RX_PKT_CSUMMED));
  		rx_buf->u.skb = NULL;
+ 		skb->ip_summed = CHECKSUM_UNNECESSARY;
  
  		gro_result = napi_gro_receive(napi, skb);
  	}