From: Luis R. Rodriguez <mcgrof@frijolero.org>
Date: Tue, 13 Mar 2012 00:41:52 +0000 (-0700)
Subject: compat-wireless: fix linux-next-pending/0002-backport-alx.patch
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ce70d936b544b6f7329b92bd7b99035c6b117a0b;p=openwrt%2Fstaging%2Fblogic.git

compat-wireless: fix linux-next-pending/0002-backport-alx.patch

The last hunk was must be placed in context, patch
is stupid and will only accept hunks in order.

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

diff --git a/linux-next-pending/0002-backport-alx.patch b/linux-next-pending/0002-backport-alx.patch
index b5dbace06210..2486e38fd1b3 100644
--- a/linux-next-pending/0002-backport-alx.patch
+++ b/linux-next-pending/0002-backport-alx.patch
@@ -14,6 +14,17 @@ This should go into patches/01-netdev.patch
  }
  
  
+@@ -341,8 +341,10 @@ static int alx_set_mac_address(struct ne
+ 	if (netif_running(netdev))
+ 		return -EBUSY;
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
+ 	if (netdev->addr_assign_type & NET_ADDR_RANDOM)
+ 		netdev->addr_assign_type ^= NET_ADDR_RANDOM;
++#endif
+ 
+ 	memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
+ 	memcpy(hw->mac_addr, addr->sa_data, netdev->addr_len);
 @@ -2483,7 +2487,7 @@ static void alx_free_all_rtx_descriptor(
  	ring_header->size = ring_header->used = 0;
  }
@@ -120,14 +131,3 @@ This should go into patches/01-netdev.patch
  };
  
  
-@@ -341,8 +341,10 @@ static int alx_set_mac_address(struct ne
- 	if (netif_running(netdev))
- 		return -EBUSY;
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
- 	if (netdev->addr_assign_type & NET_ADDR_RANDOM)
- 		netdev->addr_assign_type ^= NET_ADDR_RANDOM;
-+#endif
- 
- 	memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
- 	memcpy(hw->mac_addr, addr->sa_data, netdev->addr_len);