From: David S. Miller <davem@davemloft.net>
Date: Thu, 5 May 2011 21:59:02 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: upstream/snapshot3+hdmi~10386^2~160
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7143b7d41218d4fc2ea33e6056c73609527ae687;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/tg3.c
---

7143b7d41218d4fc2ea33e6056c73609527ae687
diff --cc drivers/net/tg3.c
index 7c7c9a8,7a5daef..ec19530
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@@ -12745,10 -12325,12 +12745,12 @@@ static void __devinit tg3_get_eeprom_hw
  		}
  		val = tr32(VCPU_CFGSHDW);
  		if (val & VCPU_CFGSHDW_ASPM_DBNC)
 -			tp->tg3_flags |= TG3_FLAG_ASPM_WORKAROUND;
 +			tg3_flag_set(tp, ASPM_WORKAROUND);
  		if ((val & VCPU_CFGSHDW_WOL_ENABLE) &&
- 		    (val & VCPU_CFGSHDW_WOL_MAGPKT))
+ 		    (val & VCPU_CFGSHDW_WOL_MAGPKT)) {
 -			tp->tg3_flags |= TG3_FLAG_WOL_ENABLE;
 +			tg3_flag_set(tp, WOL_ENABLE);
+ 			device_set_wakeup_enable(&tp->pdev->dev, true);
+ 		}
  		goto done;
  	}
  
@@@ -12878,11 -12460,13 +12880,13 @@@
  
  		if (tp->phy_flags & TG3_PHYFLG_ANY_SERDES &&
  		    !(nic_cfg & NIC_SRAM_DATA_CFG_FIBER_WOL))
 -			tp->tg3_flags &= ~TG3_FLAG_WOL_CAP;
 +			tg3_flag_clear(tp, WOL_CAP);
  
 -		if ((tp->tg3_flags & TG3_FLAG_WOL_CAP) &&
 +		if (tg3_flag(tp, WOL_CAP) &&
- 		    (nic_cfg & NIC_SRAM_DATA_CFG_WOL_ENABLE))
+ 		    (nic_cfg & NIC_SRAM_DATA_CFG_WOL_ENABLE)) {
 -			tp->tg3_flags |= TG3_FLAG_WOL_ENABLE;
 +			tg3_flag_set(tp, WOL_ENABLE);
+ 			device_set_wakeup_enable(&tp->pdev->dev, true);
+ 		}
  
  		if (cfg2 & (1 << 17))
  			tp->phy_flags |= TG3_PHYFLG_CAPACITIVE_COUPLING;