2012-02-17 09:49:13

by Luciano Coelho

Subject: [PATCH 1/2] compat-wireless: update bluetooth patch to latest wireless-testing

There is a small change in the bt_sock_unregister() function in
af_bluetooth (an extra if) that cause the patch not to apply anymore.

Signed-off-by: Luciano Coelho <[email protected]>
---
patches/16-bluetooth.patch | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/patches/16-bluetooth.patch b/patches/16-bluetooth.patch
index da533cf..3f43307 100644
--- a/patches/16-bluetooth.patch
+++ b/patches/16-bluetooth.patch
@@ -63,9 +63,9 @@ here still, but for now we keep this here.
+#else
+ err = bt_proto[proto]->create(net, sock, proto);
+#endif
- bt_sock_reclassify_lock(sock, proto);
+ if (!err)
+ bt_sock_reclassify_lock(sock->sk, proto);
module_put(bt_proto[proto]->owner);
- }
@@ -475,7 +483,11 @@ int bt_sock_ioctl(struct socket *sock, u
if (sk->sk_state == BT_LISTEN)
return -EINVAL;
--
1.7.5.4

2012-02-17 09:49:15

by Luciano Coelho

Subject: [PATCH 2/2] compat-wireless: update makefiles patch for latest wireless-testing

The drivers/net/usb/Makefile doesn't have qmi_wwan.o anymore, so we
don't need to patch it out with the latest wireless-testing.

Signed-off-by: Luciano Coelho <[email protected]>
---
patches/99-change-makefiles.patch | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/patches/99-change-makefiles.patch b/patches/99-change-makefiles.patch
index 3ab5c73..62be69b 100644
--- a/patches/99-change-makefiles.patch
+++ b/patches/99-change-makefiles.patch
@@ -15,7 +15,7 @@ only the wireless stuff.
-obj-$(CONFIG_EEPROM_DIGSY_MTC_CFG) += digsy_mtc_eeprom.o
--- a/drivers/net/usb/Makefile
+++ b/drivers/net/usb/Makefile
-@@ -2,32 +2,6 @@
+@@ -2,31 +2,6 @@
# Makefile for USB Network drivers
#

@@ -46,7 +46,6 @@ only the wireless stuff.
-obj-$(CONFIG_USB_NET_CX82310_ETH) += cx82310_eth.o
-obj-$(CONFIG_USB_NET_CDC_NCM) += cdc_ncm.o
-obj-$(CONFIG_USB_VL600) += lg-vl600.o
--obj-$(CONFIG_USB_NET_QMI_WWAN) += qmi_wwan.o
-
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
--
1.7.5.4

2012-02-17 23:58:24

by Luis R. Rodriguez

Subject: Re: [PATCH 1/2] compat-wireless: update bluetooth patch to latest wireless-testing

On Fri, Feb 17, 2012 at 1:49 AM, Luciano Coelho <[email protected]> wrote:
> There is a small change in the bt_sock_unregister() function in
> af_bluetooth (an extra if) that cause the patch not to apply anymore.
>
> Signed-off-by: Luciano Coelho <[email protected]>

Applied and pushed, thanks!

Luis

2012-02-17 23:59:45

by Luis R. Rodriguez

Subject: Re: [PATCH 2/2] compat-wireless: update makefiles patch for latest wireless-testing

On Fri, Feb 17, 2012 at 1:49 AM, Luciano Coelho <[email protected]> wrote:
> The drivers/net/usb/Makefile doesn't have qmi_wwan.o anymore, so we
> don't need to patch it out with the latest wireless-testing.
>
> Signed-off-by: Luciano Coelho <[email protected]>

It seems this one hasn't made it to linux-next.git yet so I'll wait on
applying until it does. Just FYI, compat-wireless uses linux-next.git,
so there may be one or two day delays between subsystem integration
changes.

Luis