Skip to content

Commit

Permalink
Bluetooth: Remove broken force_lesc_support debugfs option
Browse files Browse the repository at this point in the history
The force_lesc_support debugfs option never really worked. It has a race
condition between creating the debugfs entry and registering the L2CAP
fixed channel for BR/EDR SMP support.

Also this has been replaced with a working force_bredr_smp debugfs
switch that developers can use now.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
  • Loading branch information
Marcel Holtmann committed Jan 2, 2015
1 parent 300acfd commit 91389af
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 50 deletions.
1 change: 0 additions & 1 deletion include/net/bluetooth/hci.h
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ enum {
enum {
HCI_DUT_MODE,
HCI_FORCE_SC,
HCI_FORCE_LESC,
HCI_FORCE_BREDR_SMP,
HCI_FORCE_STATIC_ADDR,
};
Expand Down
49 changes: 0 additions & 49 deletions net/bluetooth/hci_debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -421,50 +421,6 @@ static const struct file_operations force_sc_support_fops = {
.llseek = default_llseek,
};

static ssize_t force_lesc_support_read(struct file *file,
char __user *user_buf,
size_t count, loff_t *ppos)
{
struct hci_dev *hdev = file->private_data;
char buf[3];

buf[0] = test_bit(HCI_FORCE_LESC, &hdev->dbg_flags) ? 'Y': 'N';
buf[1] = '\n';
buf[2] = '\0';
return simple_read_from_buffer(user_buf, count, ppos, buf, 2);
}

static ssize_t force_lesc_support_write(struct file *file,
const char __user *user_buf,
size_t count, loff_t *ppos)
{
struct hci_dev *hdev = file->private_data;
char buf[32];
size_t buf_size = min(count, (sizeof(buf)-1));
bool enable;

if (copy_from_user(buf, user_buf, buf_size))
return -EFAULT;

buf[buf_size] = '\0';
if (strtobool(buf, &enable))
return -EINVAL;

if (enable == test_bit(HCI_FORCE_LESC, &hdev->dbg_flags))
return -EALREADY;

change_bit(HCI_FORCE_LESC, &hdev->dbg_flags);

return count;
}

static const struct file_operations force_lesc_support_fops = {
.open = simple_open,
.read = force_lesc_support_read,
.write = force_lesc_support_write,
.llseek = default_llseek,
};

static int idle_timeout_set(void *data, u64 val)
{
struct hci_dev *hdev = data;
Expand Down Expand Up @@ -568,11 +524,6 @@ void hci_debugfs_create_bredr(struct hci_dev *hdev)

debugfs_create_file("force_sc_support", 0644, hdev->debugfs,
hdev, &force_sc_support_fops);

if (lmp_le_capable(hdev))
debugfs_create_file("force_lesc_support", 0644,
hdev->debugfs, hdev,
&force_lesc_support_fops);
}

if (lmp_sniff_capable(hdev)) {
Expand Down

0 comments on commit 91389af

Please sign in to comment.