From: David S. Miller <davem@davemloft.net>
Date: Sat, 10 Nov 2012 23:32:51 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.8-rc1~139^2~381
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d4185bbf62a5d8d777ee445db1581beb17882a07;p=thirdparty%2Flinux.git

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

Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

Minor conflict between the BCM_CNIC define removal in net-next
and a bug fix added to net.  Based upon a conflict resolution
patch posted by Stephen Rothwell.

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

d4185bbf62a5d8d777ee445db1581beb17882a07
diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 0546cf4f762e8,bd1fd3d87c24d..04b9f0ab183bd
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@@ -12065,10 -11899,22 +12066,20 @@@ static int __devinit bnx2x_init_one(str
  	/* calc qm_cid_count */
  	bp->qm_cid_count = bnx2x_set_qm_cid_count(bp);
  
 -#ifdef BCM_CNIC
 -	/* disable FCOE L2 queue for E1x */
 +	/* disable FCOE L2 queue for E1x*/
  	if (CHIP_IS_E1x(bp))
  		bp->flags |= NO_FCOE_FLAG;
 +
+ 	/* disable FCOE for 57840 device, until FW supports it */
+ 	switch (ent->driver_data) {
+ 	case BCM57840_O:
+ 	case BCM57840_4_10:
+ 	case BCM57840_2_20:
+ 	case BCM57840_MFO:
+ 	case BCM57840_MF:
+ 		bp->flags |= NO_FCOE_FLAG;
+ 	}
 -#endif
 -
+ 
  	/* Set bp->num_queues for MSI-X mode*/
  	bnx2x_set_num_queues(bp);
  
diff --cc drivers/net/ethernet/freescale/gianfar.c
index 81a0f33d263fe,19ac096cb07b7..bffb2edd68584
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@@ -1349,14 -1353,13 +1349,17 @@@ static int gfar_restore(struct device *
  	struct gfar_private *priv = dev_get_drvdata(dev);
  	struct net_device *ndev = priv->ndev;
  
- 	if (!netif_running(ndev))
+ 	if (!netif_running(ndev)) {
+ 		netif_device_attach(ndev);
+ 
  		return 0;
+ 	}
  
 -	gfar_init_bds(ndev);
 +	if (gfar_init_bds(ndev)) {
 +		free_skb_resources(priv);
 +		return -ENOMEM;
 +	}
 +
  	init_registers(ndev);
  	gfar_set_mac_address(ndev);
  	gfar_init_mac(ndev);