From: Luis R. Rodriguez <mcgrof@frijolero.org>
Date: Thu, 23 Feb 2012 23:36:23 +0000 (-0800)
Subject: compat-wireless: refresh patches for backport alx
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9cf0e8d863d080e5a253e78e18752177937ca2bd;p=openwrt%2Fstaging%2Fblogic.git

compat-wireless: refresh patches for backport alx

alx is not yet upstream but it will be soon I hope.
This updates the backport of it.

Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>
---

diff --git a/crap/0001-backport-alx.patch b/crap/0001-backport-alx.patch
index 786cc39d0876..96b1f18617fd 100644
--- a/crap/0001-backport-alx.patch
+++ b/crap/0001-backport-alx.patch
@@ -14,7 +14,7 @@ This should go into patches/01-netdev.patch
  }
  
  
-@@ -2482,7 +2486,7 @@ static void alx_free_all_rtx_descriptor(
+@@ -2483,7 +2487,7 @@ static void alx_free_all_rtx_descriptor(
  	ring_header->size = ring_header->used = 0;
  }
  
@@ -23,7 +23,7 @@ This should go into patches/01-netdev.patch
  static netdev_features_t alx_fix_features(struct net_device *netdev,
  					  netdev_features_t features)
  {
-@@ -2514,6 +2518,8 @@ static int alx_set_features(struct net_d
+@@ -2515,6 +2519,8 @@ static int alx_set_features(struct net_d
  		alx_vlan_mode(netdev, features);
  	return 0;
  }
@@ -32,7 +32,7 @@ This should go into patches/01-netdev.patch
  /*
   * alx_change_mtu - Change the Maximum Transfer Unit
   */
-@@ -2537,7 +2543,17 @@ static int alx_change_mtu(struct net_dev
+@@ -2538,7 +2544,17 @@ static int alx_change_mtu(struct net_dev
  		adpt->hw.mtu = new_mtu;
  		adpt->rxbuf_size = new_mtu > ALX_DEF_RX_BUF_SIZE ?
  				   ALIGN(max_frame, 8) : ALX_DEF_RX_BUF_SIZE;
@@ -50,7 +50,7 @@ This should go into patches/01-netdev.patch
  		alx_reinit_locked(adpt);
  	}
  
-@@ -3443,8 +3459,10 @@ static const struct net_device_ops alx_n
+@@ -3444,8 +3460,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,
@@ -61,7 +61,7 @@ This should go into patches/01-netdev.patch
  #ifdef CONFIG_NET_POLL_CONTROLLER
  	.ndo_poll_controller    = alx_poll_controller,
  #endif
-@@ -3531,7 +3549,7 @@ static int __devinit alx_init(struct pci
+@@ -3532,7 +3550,7 @@ static int __devinit alx_init(struct pci
  	netdev->base_addr = (unsigned long)adpt->hw.hw_addr;
  
  	/* set cb member of netdev structure*/
@@ -70,7 +70,7 @@ This should go into patches/01-netdev.patch
  	alx_set_ethtool_ops(netdev);
  	netdev->watchdog_timeo = ALX_WATCHDOG_TIME;
  	strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
-@@ -3579,6 +3597,7 @@ static int __devinit alx_init(struct pci
+@@ -3580,6 +3598,7 @@ static int __devinit alx_init(struct pci
  	adpt->max_rxques = min_t(int, ALX_MAX_RX_QUEUES, num_online_cpus());
  	adpt->max_txques = min_t(int, ALX_MAX_TX_QUEUES, num_online_cpus());
  
@@ -78,7 +78,7 @@ This should go into patches/01-netdev.patch
  	netdev->hw_features = NETIF_F_SG	 |
  			      NETIF_F_HW_CSUM	 |
  			      NETIF_F_HW_VLAN_RX;
-@@ -3590,6 +3609,19 @@ static int __devinit alx_init(struct pci
+@@ -3591,6 +3610,19 @@ static int __devinit alx_init(struct pci
  	}
  	netdev->features = netdev->hw_features |
  			   NETIF_F_HW_VLAN_TX;
@@ -98,7 +98,7 @@ This should go into patches/01-netdev.patch
  
  	/* get mac addr and perm mac addr, set to register */
  	if (hw->cbs.get_mac_addr)
-@@ -3859,6 +3891,8 @@ static struct pci_error_handlers alx_err
+@@ -3862,6 +3894,8 @@ static struct pci_error_handlers alx_err
  #ifdef CONFIG_PM_SLEEP
  static SIMPLE_DEV_PM_OPS(alx_pm_ops, alx_suspend, alx_resume);
  #define ALX_PM_OPS      (&alx_pm_ops)
@@ -107,7 +107,7 @@ This should go into patches/01-netdev.patch
  #else
  #define ALX_PM_OPS      NULL
  #endif
-@@ -3871,7 +3905,12 @@ static struct pci_driver alx_driver = {
+@@ -3874,7 +3908,12 @@ static struct pci_driver alx_driver = {
  	.remove      = __devexit_p(alx_remove),
  	.shutdown    = alx_shutdown,
  	.err_handler = &alx_err_handler,