From: Johannes Berg Date: Sun, 31 Mar 2013 22:40:42 +0000 (+0200) Subject: add BACKPORT_BT_SOCK_CREATE_NEEDS_KERN config symbol X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6ba1ed306dbb1a61580441ca87eb2a42b034a9b0;p=openwrt%2Fstaging%2Fblogic.git add BACKPORT_BT_SOCK_CREATE_NEEDS_KERN config symbol Also need to rename it in the patch. Signed-off-by: Johannes Berg --- diff --git a/compat/compat/Kconfig b/compat/compat/Kconfig index 6d1bda604ef3..607285066b23 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 e4823d520d13..8af75fffc562 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 13e1f1bc77df..a5ebf7983a5f 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 eed70c6a3dc3..68f6afbf113d 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 87a98121f430..430fb33bbc7e 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 0807ccc7f104..87d601460244 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 0cf1f8c366d9..f3bf80191750 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 89307b4174ad..a57f33abd50b 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 5affe501e1a9..a9f9c5331402 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 64bc1a4cb0f3..ea1a53c07359 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