diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-12-13 20:41:23 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-12-13 20:41:23 +0100 |
| commit | 10c38c3306c04ec26b1536d30b8b11ccab32faa5 (patch) | |
| tree | 3aada0b8d12cb8d67c88fa39c4ad71ac7b2cef27 /net | |
| parent | iwlagn: implement layout-agnostic EEPROM reading (diff) | |
| parent | Bluetooth: add NULL pointer check in HCI (diff) | |
| download | linux-10c38c3306c04ec26b1536d30b8b11ccab32faa5.tar.xz linux-10c38c3306c04ec26b1536d30b8b11ccab32faa5.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/rfcomm/core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index fa642aa652bd..432a9a633e8d 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c @@ -311,6 +311,7 @@ static void rfcomm_dlc_clear_state(struct rfcomm_dlc *d) d->state = BT_OPEN; d->flags = 0; d->mscex = 0; + d->sec_level = BT_SECURITY_LOW; d->mtu = RFCOMM_DEFAULT_MTU; d->v24_sig = RFCOMM_V24_RTC | RFCOMM_V24_RTR | RFCOMM_V24_DV; |