[kernel/f13/master] revert the most obvious bit of asix .33->.34 to attempt to fix networkign for hjlu

[Kyle McMartin]

commit 5bfb0a6fb8cdc3a7c3a6a59f994454ae4c465add
Author: Kyle McMartin <kyle at dreadnought.i.jkkm.org>
Date:   Fri Sep 3 16:15:20 2010 -0400

    revert the most obvious bit of asix .33->.34 to attempt to fix
    networkign for hjlu

 asix-use-eth_mac_addr.patch |   22 ++++++++++++++++++++++
 kernel.spec                 |    5 +++++
 2 files changed, 27 insertions(+), 0 deletions(-)
---
diff --git a/asix-use-eth_mac_addr.patch b/asix-use-eth_mac_addr.patch
new file mode 100644
index 0000000..ba77e6e
--- /dev/null
+++ b/asix-use-eth_mac_addr.patch
@@ -0,0 +1,22 @@
+diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
+index 35f56fc..1523ad4 100644
+--- a/drivers/net/usb/asix.c
++++ b/drivers/net/usb/asix.c
+@@ -946,7 +946,7 @@ static const struct net_device_ops ax88772_netdev_ops = {
+ 	.ndo_start_xmit		= usbnet_start_xmit,
+ 	.ndo_tx_timeout		= usbnet_tx_timeout,
+ 	.ndo_change_mtu		= usbnet_change_mtu,
+-	.ndo_set_mac_address 	= asix_set_mac_address,
++	.ndo_set_mac_address 	= eth_mac_addr,
+ 	.ndo_validate_addr	= eth_validate_addr,
+ 	.ndo_do_ioctl		= asix_ioctl,
+ 	.ndo_set_multicast_list = asix_set_multicast,
+@@ -1240,7 +1240,7 @@ static const struct net_device_ops ax88178_netdev_ops = {
+ 	.ndo_stop		= usbnet_stop,
+ 	.ndo_start_xmit		= usbnet_start_xmit,
+ 	.ndo_tx_timeout		= usbnet_tx_timeout,
+-	.ndo_set_mac_address 	= asix_set_mac_address,
++	.ndo_set_mac_address 	= eth_mac_addr,
+ 	.ndo_validate_addr	= eth_validate_addr,
+ 	.ndo_set_multicast_list = asix_set_multicast,
+ 	.ndo_do_ioctl 		= asix_ioctl,
diff --git a/kernel.spec b/kernel.spec
index 3d953b6..f746696 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -771,6 +771,7 @@ Patch12490: dell-wmi-add-support-for-eject-key.patch
 Patch12500: irda-correctly-clean-up-self-ias_obj-on-irda_bind-failure.patch
 Patch12510: wireless-extensions-fix-kernel-heap-content-leak.patch
 Patch12515: sanity-check-bond-proc_entry.patch
+Patch12516: asix-use-eth_mac_addr.patch
 
 %endif
 
@@ -1443,6 +1444,9 @@ ApplyPatch wireless-extensions-fix-kernel-heap-content-leak.patch
 # bz #604630
 ApplyPatch sanity-check-bond-proc_entry.patch
 
+# bz #629871
+ApplyPatch asix-use-eth_mac_addr.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2066,6 +2070,7 @@ fi
 %changelog
 * Fri Sep 03 2010 Kyle McMartin <kmcmartin at redhat.com> 2.6.34.6-52
 - sanity-check-bond-proc_entry.patch (rhbz#604630)
+- asix.c: stub out set_mac_address in case it's breaking things (rhbz#629871)
 
 * Fri Sep 03 2010 Kyle McMartin <kmcmartin at redhat.com> 2.6.34.6-51
 - lirc_imon: move alloc before use (rhbz#629980)