Remove a bogus inline declaration that broke ARM and ppc builds (rhbz 787373)

2 files changed, 56 insertions, 0 deletions

diff --git a/Bluetooth-Remove-bogus-inline-decl-from-l2cap_chan_connect.patch b/Bluetooth-Remove-bogus-inline-decl-from-l2cap_chan_connect.patch
new file mode 100644
index 00000000..c5991992
--- /dev/null
+++ b/Bluetooth-Remove-bogus-inline-decl-from-l2cap_chan_connect.patch
@@ -0,0 +1,49 @@
+From 9a4b860f36f995ecda36d8312a56ae1d34a6c541 Mon Sep 17 00:00:00 2001
+From: Johan Hedberg <johan.hedberg@intel.com>
+Date: Sun, 8 Jan 2012 22:51:16 +0200
+Subject: [PATCH] Bluetooth: Remove bogus inline declaration from
+ l2cap_chan_connect
+
+As reported by Dan Carpenter this function causes a Sparse warning and
+shouldn't be declared inline:
+
+include/net/bluetooth/l2cap.h:837:30 error: marked inline, but without a
+definition"
+
+Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
+Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
+Acked-by: Marcel Holtmann <marcel@holtmann.org>
+---
+ include/net/bluetooth/l2cap.h |    2 +-
+ net/bluetooth/l2cap_core.c    |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
+index 68f5891..124f7cf 100644
+--- a/include/net/bluetooth/l2cap.h
++++ b/include/net/bluetooth/l2cap.h
+@@ -834,7 +834,7 @@ int l2cap_add_scid(struct l2cap_chan *chan,  __u16 scid);
+ struct l2cap_chan *l2cap_chan_create(struct sock *sk);
+ void l2cap_chan_close(struct l2cap_chan *chan, int reason);
+ void l2cap_chan_destroy(struct l2cap_chan *chan);
+-inline int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
++int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
+ 								bdaddr_t *dst);
+ int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len,
+ 								u32 priority);
+diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
+index faf0b11..980abdb 100644
+--- a/net/bluetooth/l2cap_core.c
++++ b/net/bluetooth/l2cap_core.c
+@@ -1120,7 +1120,7 @@ static struct l2cap_chan *l2cap_global_chan_by_psm(int state, __le16 psm, bdaddr
+ 	return c1;
+ }
+ 
+-inline int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, bdaddr_t *dst)
++int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, bdaddr_t *dst)
+ {
+ 	struct sock *sk = chan->sk;
+ 	bdaddr_t *src = &bt_sk(sk)->src;
+-- 
+1.7.6.5
+
diff --git a/kernel.spec b/kernel.spec
index 7be1fcfd..faf2323a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -749,6 +749,9 @@ Patch21096: hfsplus-Add-an-ioctl-to-bless-files.patch
 #rhbz 788260
 Patch21233: jbd2-clear-BH_Delay-and-BH_Unwritten-in-journal_unmap_buf.patch
 
+#rhbz 787373
+Patch21234: Bluetooth-Remove-bogus-inline-decl-from-l2cap_chan_connect.patch
+
 # compat-wireless patches
 Patch50000: compat-wireless-config-fixups.patch
 Patch50001: compat-wireless-pr_fmt-warning-avoidance.patch
@@ -1446,6 +1449,9 @@ ApplyPatch hfsplus-Add-an-ioctl-to-bless-files.patch
 #rhbz 788269
 ApplyPatch jbd2-clear-BH_Delay-and-BH_Unwritten-in-journal_unmap_buf.patch
 
+#rhbz 787373
+ApplyPatch Bluetooth-Remove-bogus-inline-decl-from-l2cap_chan_connect.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2317,6 +2323,7 @@ fi
 #                 ||     ||
 %changelog
 * Wed Feb 08 2012 Josh Boyer <jwboyer@redhat.com>
+- Remove a bogus inline declaration that broke ARM and ppc builds (rhbz 787373)
 - CVE-2011-4086 jbd2: unmapped buffer with _Unwritten or _Delay flags set can
   lead to DoS (rhbz 788260)
 - Add new upstream NFS id mapping patches from Steve Dickson