From 73a35b993e89d5939b736085b4ef710fd7d66b05 Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle@dreadnought.i.jkkm.org>
Date: Sep 06 2010 20:02:03 +0000
Subject: kill unhelpful patches i committed


---

diff --git a/asix-use-eth_mac_addr.patch b/asix-use-eth_mac_addr.patch
deleted file mode 100644
index ba77e6e..0000000
--- a/asix-use-eth_mac_addr.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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 37da9ad..00ac22d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -776,8 +776,6 @@ 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
 Patch12517: flexcop-fix-xlate_proc_name-warning.patch
 
 Patch12520: acpi-ec-pm-fix-race-between-ec-transactions-and-system-suspend.patch
@@ -1465,12 +1463,6 @@ ApplyPatch irda-correctly-clean-up-self-ias_obj-on-irda_bind-failure.patch
 # cve-2010-2955
 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
-
 # bz #575873
 ApplyPatch flexcop-fix-xlate_proc_name-warning.patch
 
@@ -2130,8 +2122,6 @@ fi
 - Add fix for CVE-2010-2960: keyctl_session_to_parent NULL deref system crash
 
 * Fri Sep 03 2010 Kyle McMartin <kmcmartin@redhat.com>
-- sanity-check-bond-proc_entry.patch (rhbz#604630)
-- asix.c: stub out set_mac_address in case it's breaking things (rhbz#625479)
 - default to pci=nocrs
 - flexcop: fix registering braindead stupid names (#575873)
 
diff --git a/sanity-check-bond-proc_entry.patch b/sanity-check-bond-proc_entry.patch
deleted file mode 100644
index dbc5e2f..0000000
--- a/sanity-check-bond-proc_entry.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
-index 0075514..136963b 100644
---- a/drivers/net/bonding/bond_main.c
-+++ b/drivers/net/bonding/bond_main.c
-@@ -3285,7 +3285,7 @@ static void bond_create_proc_entry(struct bonding *bond)
- 	struct net_device *bond_dev = bond->dev;
- 	struct bond_net *bn = net_generic(dev_net(bond_dev), bond_net_id);
- 
--	if (bn->proc_dir) {
-+	if (bn->proc_dir && !bond->proc_entry) {
- 		bond->proc_entry = proc_create_data(bond_dev->name,
- 						    S_IRUGO, bn->proc_dir,
- 						    &bond_info_fops, bond);