From: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Date: Thu, 20 Dec 2012 03:40:34 +0000 (-0800)
Subject: compat-drivers: refresh 0001-backport-alx.patch
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b40c676974b105271e3fddd43f52e6ca66c36c0a;p=openwrt%2Fstaging%2Fblogic.git

compat-drivers: refresh 0001-backport-alx.patch

Refresh patches again.

Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---

diff --git a/patches/unified-drivers/network/0001-backport-alx.patch b/patches/unified-drivers/network/0001-backport-alx.patch
index c4d84d3b4d77..228a033b544a 100644
--- a/patches/unified-drivers/network/0001-backport-alx.patch
+++ b/patches/unified-drivers/network/0001-backport-alx.patch
@@ -59,8 +59,7 @@ This should go into patches/01-netdev.patch
  		if (netif_running(netdev))
  			alx_reinit(adpt);
  	}
- 
-@@ -2476,8 +2494,10 @@ static const struct net_device_ops alx_n
+@@ -2474,8 +2474,10 @@ static const struct net_device_ops alx_n
  	.ndo_change_mtu         = alx_change_mtu,
  	.ndo_do_ioctl           = alx_ioctl,
  	.ndo_tx_timeout         = alx_tx_timeout,
@@ -71,7 +70,7 @@ This should go into patches/01-netdev.patch
  #ifdef CONFIG_NET_POLL_CONTROLLER
  	.ndo_poll_controller    = alx_poll_controller,
  #endif
-@@ -2571,7 +2591,7 @@ alx_probe(struct pci_dev *pdev, const st
+@@ -2577,7 +2579,7 @@ alx_probe(struct pci_dev *pdev, const st
  		goto err_iomap;
  	}
  
@@ -80,7 +79,7 @@ This should go into patches/01-netdev.patch
  	alx_set_ethtool_ops(netdev);
  	netdev->irq  = pdev->irq;
  	netdev->watchdog_timeo = ALX_WATCHDOG_TIME;
-@@ -2614,12 +2634,21 @@ alx_probe(struct pci_dev *pdev, const st
+@@ -2622,12 +2624,21 @@ alx_probe(struct pci_dev *pdev, const st
  		}
  	}
  
@@ -101,8 +100,8 @@ This should go into patches/01-netdev.patch
 +#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) */
  
  	/* read permanent mac addr from register or eFuse */
- 	if (alx_get_perm_macaddr(adpt, adpt->perm_addr)) {
-@@ -2783,6 +2812,8 @@ static struct pci_error_handlers alx_err
+ 	if (alx_get_perm_macaddr(hw, hw->perm_addr)) {
+@@ -2803,6 +2814,8 @@ static struct pci_error_handlers alx_err
  };
  
  #ifdef CONFIG_PM_SLEEP
@@ -111,7 +110,7 @@ This should go into patches/01-netdev.patch
  static SIMPLE_DEV_PM_OPS(alx_pm_ops, alx_suspend, alx_resume);
  #define ALX_PM_OPS      (&alx_pm_ops)
  #else
-@@ -2796,7 +2827,12 @@ static struct pci_driver alx_driver = {
+@@ -2816,7 +2829,12 @@ static struct pci_driver alx_driver = {
  	.remove      = __devexit_p(alx_remove),
  	.shutdown    = alx_shutdown,
  	.err_handler = &alx_err_handler,