diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-05-19 16:34:27 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-05-19 16:34:27 -0400 |
| commit | 20b4f9c73ff4137d720c4f378e1a780ac6a6c04d (patch) | |
| tree | 91fd288124acb748d5442d8f517eb3de004e8400 | |
| parent | faf1dc64e345ac4de5c4429df6ed492255ae2248 (diff) | |
| parent | 40b9397a1a61a37917b93e7d57e6f2faf3a086b4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index a1e5bb7d06e8..dc4d301d3a72 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c | |||
| @@ -7519,9 +7519,9 @@ int __init l2cap_init(void) | |||
| 7519 | l2cap_debugfs = debugfs_create_file("l2cap", 0444, bt_debugfs, | 7519 | l2cap_debugfs = debugfs_create_file("l2cap", 0444, bt_debugfs, |
| 7520 | NULL, &l2cap_debugfs_fops); | 7520 | NULL, &l2cap_debugfs_fops); |
| 7521 | 7521 | ||
| 7522 | debugfs_create_u16("l2cap_le_max_credits", 0466, bt_debugfs, | 7522 | debugfs_create_u16("l2cap_le_max_credits", 0644, bt_debugfs, |
| 7523 | &le_max_credits); | 7523 | &le_max_credits); |
| 7524 | debugfs_create_u16("l2cap_le_default_mps", 0466, bt_debugfs, | 7524 | debugfs_create_u16("l2cap_le_default_mps", 0644, bt_debugfs, |
| 7525 | &le_default_mps); | 7525 | &le_default_mps); |
| 7526 | 7526 | ||
| 7527 | bt_6lowpan_init(); | 7527 | bt_6lowpan_init(); |