3.0 patches

diff --git a/queue-3.0/igb-fix-wol-on-second-port-of-i350-device.patch b/queue-3.0/igb-fix-wol-on-second-port-of-i350-device.patch
new file mode 100644 (file)
index 0000000..f916602
--- /dev/null
+++ b/queue-3.0/igb-fix-wol-on-second-port-of-i350-device.patch
@@ -0,0 +1,34 @@
+From 6d337dce664b6872ddf1655f6b1fcab76ce35b08 Mon Sep 17 00:00:00 2001
+From: Carolyn Wyborny <carolyn.wyborny@intel.com>
+Date: Thu, 7 Jul 2011 00:24:56 +0000
+Subject: igb: fix WOL on second port of i350 device
+
+From: Carolyn Wyborny <carolyn.wyborny@intel.com>
+
+commit 6d337dce664b6872ddf1655f6b1fcab76ce35b08 upstream.
+
+This patch fixes a problem where WOL would fail on second port of i350
+device.
+
+Reported-by: Martin Wilck <martin.wilck@ts.fujitsu.com>
+Reported-by: Stefan Assmann<sassmann@redhat.com>
+Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com>
+Tested-by:  Aaron Brown  <aaron.f.brown@intel.com>
+Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/net/igb/igb_main.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/igb/igb_main.c
++++ b/drivers/net/igb/igb_main.c
+@@ -1985,7 +1985,7 @@ static int __devinit igb_probe(struct pc
+ 
+       if (hw->bus.func == 0)
+               hw->nvm.ops.read(hw, NVM_INIT_CONTROL3_PORT_A, 1, &eeprom_data);
+-      else if (hw->mac.type == e1000_82580)
++      else if (hw->mac.type >= e1000_82580)
+               hw->nvm.ops.read(hw, NVM_INIT_CONTROL3_PORT_A +
+                                NVM_82580_LAN_FUNC_OFFSET(hw->bus.func), 1,
+                                &eeprom_data);

diff --git a/queue-3.0/series b/queue-3.0/series
index 0230df07c73aa2a95f973f15daa045cfe49548ff..c831516acf35515ed1aef72b753a03bb46f4bbe2 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -52,3 +52,4 @@ drm-radeon-kms-set-a-default-max_pixel_clock.patch
 drm-radeon-kms-make-sure-pci-max-read-request-size-is-valid-on-evergreen-v2.patch
 mm-page-allocator-initialise-zlc-for-first-zone-eligible-for-zone_reclaim.patch
 mm-page-allocator-reconsider-zones-for-allocation-after-direct-reclaim.patch
+igb-fix-wol-on-second-port-of-i350-device.patch