From 6ba1ed306dbb1a61580441ca87eb2a42b034a9b0 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Mon, 1 Apr 2013 00:40:42 +0200 Subject: add BACKPORT_BT_SOCK_CREATE_NEEDS_KERN config symbol Also need to rename it in the patch. Signed-off-by: Johannes Berg --- compat/compat/Kconfig | 5 +++++ .../network/16-bluetooth/net_bluetooth_af_bluetooth.patch | 4 ++-- .../network/16-bluetooth/net_bluetooth_bnep_sock.patch | 2 +- .../network/16-bluetooth/net_bluetooth_cmtp_sock.patch | 2 +- .../network/16-bluetooth/net_bluetooth_hci_sock.patch | 2 +- .../network/16-bluetooth/net_bluetooth_hidp_core.patch | 2 +- .../network/16-bluetooth/net_bluetooth_hidp_sock.patch | 2 +- .../network/16-bluetooth/net_bluetooth_l2cap_sock.patch | 2 +- .../network/16-bluetooth/net_bluetooth_rfcomm_sock.patch | 2 +- .../network/16-bluetooth/net_bluetooth_sco.patch | 2 +- 10 files changed, 15 insertions(+), 10 deletions(-) diff --git a/compat/compat/Kconfig b/compat/compat/Kconfig index 6d1bda60..60728506 100644 --- a/compat/compat/Kconfig +++ b/compat/compat/Kconfig @@ -28,3 +28,8 @@ config BACKPORT_CRC8 config BACKPORT_ATOMIC64 bool default y if !64BIT && !GENERIC_ATOMIC64 + +config BACKPORT_BT_SOCK_CREATE_NEEDS_KERN + bool + # FIXME: REDHAT_6_0 also requires this + default y if !BACKPORT_KERNEL_2_6_33 diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch index e4823d52..8af75fff 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch @@ -4,7 +4,7 @@ } EXPORT_SYMBOL(bt_sock_unregister); -+#if defined(CONFIG_COMPAT_BT_SOCK_CREATE_NEEDS_KERN) ++#if defined(CPTCFG_BACKPORT_BT_SOCK_CREATE_NEEDS_KERN) static int bt_sock_create(struct net *net, struct socket *sock, int proto, int kern) +#else @@ -17,7 +17,7 @@ read_lock(&bt_proto_lock); if (bt_proto[proto] && try_module_get(bt_proto[proto]->owner)) { -+#if defined(CONFIG_COMPAT_BT_SOCK_CREATE_NEEDS_KERN) ++#if defined(CPTCFG_BACKPORT_BT_SOCK_CREATE_NEEDS_KERN) err = bt_proto[proto]->create(net, sock, proto, kern); +#else + err = bt_proto[proto]->create(net, sock, proto); diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_bnep_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_bnep_sock.patch index 13e1f1bc..a5ebf798 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_bnep_sock.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_bnep_sock.patch @@ -4,7 +4,7 @@ .obj_size = sizeof(struct bt_sock) }; -+#if defined(CONFIG_COMPAT_BT_SOCK_CREATE_NEEDS_KERN) ++#if defined(CPTCFG_BACKPORT_BT_SOCK_CREATE_NEEDS_KERN) static int bnep_sock_create(struct net *net, struct socket *sock, int protocol, int kern) +#else diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_cmtp_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_cmtp_sock.patch index eed70c6a..68f6afbf 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_cmtp_sock.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_cmtp_sock.patch @@ -4,7 +4,7 @@ .obj_size = sizeof(struct bt_sock) }; -+#if defined(CONFIG_COMPAT_BT_SOCK_CREATE_NEEDS_KERN) ++#if defined(CPTCFG_BACKPORT_BT_SOCK_CREATE_NEEDS_KERN) static int cmtp_sock_create(struct net *net, struct socket *sock, int protocol, int kern) +#else diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch index 87a98121..430fb33b 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch @@ -18,7 +18,7 @@ .obj_size = sizeof(struct hci_pinfo) }; -+#if defined(CONFIG_COMPAT_BT_SOCK_CREATE_NEEDS_KERN) ++#if defined(CPTCFG_BACKPORT_BT_SOCK_CREATE_NEEDS_KERN) static int hci_sock_create(struct net *net, struct socket *sock, int protocol, int kern) +#else diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch index 0807ccc7..87d60146 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch @@ -4,7 +4,7 @@ return ret; } -+#if defined(CONFIG_COMPAT_BT_SOCK_CREATE_NEEDS_KERN) ++#if defined(CPTCFG_BACKPORT_BT_SOCK_CREATE_NEEDS_KERN) static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, size_t count, unsigned char report_type) { diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_sock.patch index 0cf1f8c3..f3bf8019 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_sock.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_sock.patch @@ -4,7 +4,7 @@ .obj_size = sizeof(struct bt_sock) }; -+#if defined(CONFIG_COMPAT_BT_SOCK_CREATE_NEEDS_KERN) ++#if defined(CPTCFG_BACKPORT_BT_SOCK_CREATE_NEEDS_KERN) static int hidp_sock_create(struct net *net, struct socket *sock, int protocol, int kern) +#else diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch index 89307b41..a57f33ab 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch @@ -18,7 +18,7 @@ return sk; } -+#if defined(CONFIG_COMPAT_BT_SOCK_CREATE_NEEDS_KERN) ++#if defined(CPTCFG_BACKPORT_BT_SOCK_CREATE_NEEDS_KERN) static int l2cap_sock_create(struct net *net, struct socket *sock, int protocol, int kern) +#else diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch index 5affe501..a9f9c533 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch @@ -4,7 +4,7 @@ return sk; } -+#if defined(CONFIG_COMPAT_BT_SOCK_CREATE_NEEDS_KERN) ++#if defined(CPTCFG_BACKPORT_BT_SOCK_CREATE_NEEDS_KERN) static int rfcomm_sock_create(struct net *net, struct socket *sock, int protocol, int kern) +#else diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_sco.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_sco.patch index 64bc1a4c..ea1a53c0 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_sco.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_sco.patch @@ -4,7 +4,7 @@ return sk; } -+#if defined(CONFIG_COMPAT_BT_SOCK_CREATE_NEEDS_KERN) ++#if defined(CPTCFG_BACKPORT_BT_SOCK_CREATE_NEEDS_KERN) static int sco_sock_create(struct net *net, struct socket *sock, int protocol, int kern) +#else -- cgit v1.2.3