[kernel/f13/master] attempt to fix rhbz#604630

[Kyle McMartin]

commit 867bebcea95b05725796a75a059fe9462e39cfa3
Author: Kyle McMartin <kyle at dreadnought.i.jkkm.org>
Date:   Fri Sep 3 15:59:58 2010 -0400

    attempt to fix rhbz#604630

 kernel.spec                        |    7 +++++++
 sanity-check-bond-proc_entry.patch |   13 +++++++++++++
 2 files changed, 20 insertions(+), 0 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 573937c..3d953b6 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -770,6 +770,7 @@ Patch12480: kprobes-x86-fix-kprobes-to-skip-prefixes-correctly.patch
 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
 
 %endif
 
@@ -1439,6 +1440,9 @@ 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
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2060,6 +2064,9 @@ 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)
+
 * Fri Sep 03 2010 Kyle McMartin <kmcmartin at redhat.com> 2.6.34.6-51
 - lirc_imon: move alloc before use (rhbz#629980)
 
diff --git a/sanity-check-bond-proc_entry.patch b/sanity-check-bond-proc_entry.patch
new file mode 100644
index 0000000..dbc5e2f
--- /dev/null
+++ b/sanity-check-bond-proc_entry.patch
@@ -0,0 +1,13 @@
+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);