Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Thu, 5 May 2011 21:59:02 +0000 (14:59 -0700)]
Conflicts:
drivers/net/tg3.c

13 files changed:
1  2 
MAINTAINERS
drivers/net/bnx2.c
drivers/net/mii.c
drivers/net/tg3.c
drivers/net/usb/smsc95xx.c
drivers/net/usb/usbnet.c
drivers/net/veth.c
drivers/net/wireless/iwlegacy/iwl4965-base.c
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
net/core/dev.c
net/ipv4/fib_trie.c
net/ipv6/addrconf.c
net/ipv6/esp6.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
@@@ -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;
        }
  
  
                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;
Simple merge
Simple merge
Simple merge
diff --cc net/core/dev.c
Simple merge
Simple merge
Simple merge
diff --cc net/ipv6/esp6.c
Simple merge