add BACKPORT_BT_SOCK_CREATE_NEEDS_KERN config symbol

Also need to rename it in the patch.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>

diff --git a/compat/compat/Kconfig b/compat/compat/Kconfig
index 6d1bda604ef391e83f333c5251bab342fcf69d34..607285066b2320c789a4073bef2aa66171e1a549 100644 (file)
--- 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 e4823d520d134d8f10e0fbd78f582d648311c50c..8af75fffc56211eb254c38cca770a452df54fb44 100644 (file)
--- 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 13e1f1bc77df7e72c2b28277a5b8b9f2879c7e5f..a5ebf7983a5fc6c95080c16ec952e96ee1ae184a 100644 (file)
--- 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 eed70c6a3dc344fa67236baf925f305bbb746d09..68f6afbf113d92a8ce454372394e384ff11891b5 100644 (file)
--- 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 87a98121f430274ccf803a291bff6d2796466ce2..430fb33bbc7e8fe0280aeb7ce95cf724e582dc50 100644 (file)
--- 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 0807ccc7f104a5b7be857c3d8ffdee3deaca63dc..87d601460244d9de16ce5e211fb7f20df37d25ab 100644 (file)
--- 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 0cf1f8c366d950892a759fdeee6a91e245bd1cdd..f3bf801917501608e42439bcbe35165a7202d756 100644 (file)
--- 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 89307b4174ad1b8da56d82417184ccd5bb5e7398..a57f33abd50becfa5b8a7efffa9ea605cfffb276 100644 (file)
--- 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 5affe501e1a9006514dddb0991c2a72ca2a7a3e6..a9f9c5331402ef650638543d0ac486d6fce1fabc 100644 (file)
--- 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 64bc1a4cb0f35d695f4878e06424843558dd77ef..ea1a53c07359e7fb14c908582e435d06f991ba49 100644 (file)
--- 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