rpms/kernel/F-11 git-bluetooth-fixes.patch, NONE, 1.1 kernel.spec, 1.1601, 1.1602

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4393

Modified Files:
	kernel.spec 
Added Files:
	git-bluetooth-fixes.patch 
Log Message:
* Tue May 12 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.3-140
- git-bluetooth-fixes.patch: fix build error in backport from previous
  commit.


git-bluetooth-fixes.patch:

--- NEW FILE git-bluetooth-fixes.patch ---
commit e9e328f714ec7ac162b4aee27e3bd5f3c52cfe93
Author: Kyle McMartin <kyle at ihatethathostname.lab.bos.redhat.com>
Date:   Tue May 12 10:07:35 2009 -0400

    fix build error in net/bluetooth/hci_sysfs.c
    
    hdev was unset in the backport.

diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c
index 41fbfa5..ac02c12 100644
--- a/net/bluetooth/hci_sysfs.c
+++ b/net/bluetooth/hci_sysfs.c
@@ -88,6 +88,7 @@ static struct device_type bt_link = {
 static void add_conn(struct work_struct *work)
 {
 	struct hci_conn *conn = container_of(work, struct hci_conn, work_add);
+	struct hci_dev *hdev = conn->hdev;
 
 	/* ensure previous add/del is complete */
 	flush_workqueue(bluetooth);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1601
retrieving revision 1.1602
diff -u -p -r1.1601 -r1.1602
--- kernel.spec	12 May 2009 13:54:05 -0000	1.1601
+++ kernel.spec	12 May 2009 14:20:48 -0000	1.1602
@@ -586,6 +586,7 @@ Patch09: linux-2.6-upstream-reverts.patc
 # Git trees.
 Patch10: git-cpufreq.patch
 Patch11: git-bluetooth.patch
+Patch12: git-bluetooth-fixes.patch
 
 # Standalone patches
 Patch20: linux-2.6-hotfixes.patch
@@ -1135,6 +1136,7 @@ fi
 
 #ApplyPatch git-cpufreq.patch
 ApplyPatch git-bluetooth.patch
+ApplyPatch git-bluetooth-fixes.patch
 
 ApplyPatch linux-2.6-hotfixes.patch
 
@@ -1968,6 +1970,10 @@ fi
 # and build.
 
 %changelog
+* Tue May 12 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.3-140
+- git-bluetooth-fixes.patch: fix build error in backport from previous
+  commit.
+
 * Tue May 12 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.3-139
 - git-bluetooth.patch: suck in three more fixes from 2.6.30.